diff --git a/IPython/Extensions/ipy_system_conf.py b/IPython/Extensions/ipy_system_conf.py
index d838011..a445137 100644
--- a/IPython/Extensions/ipy_system_conf.py
+++ b/IPython/Extensions/ipy_system_conf.py
@@ -21,4 +21,4 @@ import clearcmd # %clear
 
 import ipy_stock_completers
 
-import IPython.Extensions.maghistory
+import IPython.history
diff --git a/IPython/Extensions/maghistory.py b/IPython/history.py
similarity index 100%
rename from IPython/Extensions/maghistory.py
rename to IPython/history.py