diff --git a/ChangeLog.md b/ChangeLog.md
index 98cf362e0..9756e4fd6 100755
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -3,6 +3,10 @@ XP Compiler ChangeLog
 
 ## ?.?.? / ????-??-??
 
+## 7.0.1 / 2016-05-01
+
+* Fixed `module.xp` being treated as class with XP language - @thekid
+
 ## 7.0.0 / 2016-02-22
 
 * Added version compatibility with XP 7 - @thekid
diff --git a/src/main/php/xp/compiler/JitClassLoader.class.php b/src/main/php/xp/compiler/JitClassLoader.class.php
index a00800c43..9554ac61e 100755
--- a/src/main/php/xp/compiler/JitClassLoader.class.php
+++ b/src/main/php/xp/compiler/JitClassLoader.class.php
@@ -134,6 +134,8 @@ public function packageContents($package) {
           $return[]= $e.'/';
         } else if (strstr($e, \xp::CLASS_FILE_EXT)) {
           $return[]= $e;
+        } else if ('module.xp' === $e) {
+          $return[]= $e;
         } else {
           $return[]= preg_replace($syntaxes, \xp::CLASS_FILE_EXT, $e);
         }