diff --git a/MANIFEST.in b/MANIFEST.in
index 4cef36c7d14f4b6f8596a9abd788b82ce470d901..321ef58cd7636e4a8f64e1b85c0d6e19e77b5c8a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,4 @@
 include image_creator/help/*.rst
-include README.rst COPYRIGHT AUTHORS ChangeLog
+include README COPYRIGHT AUTHORS ChangeLog
 recursive-include docs *
 prune docs/_build
diff --git a/README.rst b/README
similarity index 86%
rename from README.rst
rename to README
index d648ac7dc4fd267c3f617998b1cfde823207719a..a05706d6f0a6d32c27ef5e0de5e6970594d43d65 100644
--- a/README.rst
+++ b/README
@@ -1,5 +1,5 @@
-README
-======
+snf-image-creator
+=================
 
 snf-image-creator is a command line tool for creating OS images to be used with
 synnefo.
diff --git a/setup.py b/setup.py
index cf102379cfe2c53830116c77905dd40b4f66527d..bad6b74fb752d26a7a59d49e269fc0dbbf5f8f26 100755
--- a/setup.py
+++ b/setup.py
@@ -41,7 +41,7 @@ setup(
     name='snf_image_creator',
     version=image_creator.__version__,
     description='Command line tool for creating images',
-    long_description=open('README.rst').read(),
+    long_description=open('README').read(),
     url='https://code.grnet.gr/projects/snf-image-creator',
     author = "GRNET development team",
     author_email = "okeanos-dev@lists.grnet.gr",