diff --git a/MANIFEST.in b/MANIFEST.in
index 04ce10827..ce365f82e 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,7 +5,7 @@ include dmoj/cptbox/syscalls/aliases.list
 include dmoj/cptbox/syscalls/*.tbl
 include dmoj/executors/*.policy
 include dmoj/executors/csbox.exe
-include dmoj/executors/java-sandbox.jar
+include dmoj/executors/java_sandbox.jar
 include dmoj/wbox/dmsec32.dll
 include dmoj/wbox/dmsec64.dll
 include dmoj/wbox/getaddr32.exe
diff --git a/setup.py b/setup.py
index a27ebc559..039298cb2 100644
--- a/setup.py
+++ b/setup.py
@@ -137,18 +137,18 @@ def unavailable(self, e):
         f.write(readme)
 else:
     try:
-        with open(rst_path) as f:
-            readme = f.read()
+        with open(rst_path, 'rb') as f:
+            readme = f.read().replace(b'\r\n', b'\r').replace(b'\r', b'\n')
     except IOError:
         readme = None
 
 setup(
     name='dmoj',
-    version='1.1.0',
+    version='1.2.0',
     packages=find_packages(),
     package_data={
         'dmoj.cptbox': ['syscalls/aliases.list', 'syscalls/*.tbl'],
-        'dmoj.executors': ['csbox.exe', 'java-sandbox.jar', '*.policy'],
+        'dmoj.executors': ['csbox.exe', 'java_sandbox.jar', '*.policy'],
         'dmoj.wbox': ['getaddr*.exe', 'dmsec*.dll'],
     },
     entry_points={