diff --git a/ChangeLog b/ChangeLog
index 92aba30a..5e03f1af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-================= version 2.0.4 ( yet to be released) ============
+================= version 2.1 ( yet to be released) ============
 * Increased the width of the sdl inputcfg window to be more visible
 with larger font sizes
 * Uninstall script works better
diff --git a/setup.py b/setup.py
index 14dce8bf..2240d81c 100755
--- a/setup.py
+++ b/setup.py
@@ -3,10 +3,10 @@
 from distutils.core import setup
 
 setup(name="gfceux",
-		version="2.0.4",
+		version="2.1",
 		scripts = ['gfceux'],
 		packages = ['gfceux'],
-    	package_dir = {'gfceux': 'src'},
+    		package_dir = {'gfceux': 'src'},
 		data_files=[
 		    ('share/gfceux/',
 		    ['data/gfceux.xml', 'data/gfceux_big.png', 'data/gfceux.png',
diff --git a/src/main.py b/src/main.py
index 9e412641..066ac7b8 100755
--- a/src/main.py
+++ b/src/main.py
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # gfceux - Graphical launcher for fceux.
 # Designed on Ubuntu, with platfrom independence in mind.
-version = "2.0.4svn"
+version = "2.1"
 title = "gfceux"
 # Copyright (C) 2008  Lukas Sabota <ltsmooth42 _at_ gmail.com>
 ##