diff --git a/README.md b/README.md
index 55fd32d16..79b57abe2 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 <img src="doc/scapy_logo.png" width=200>
 </p>
 
+<!-- start_ppi_description -->
+
 # Scapy
 
 [![Travis Build Status](https://travis-ci.org/secdev/scapy.svg?branch=master)](https://travis-ci.org/secdev/scapy)
@@ -109,7 +111,7 @@ Python modules, such as `matplotlib` or `cryptography`. See the
 [documentation](http://scapy.readthedocs.io/en/latest/installation.html) and
 follow the instructions to install them.
 
-<!--- stop_ppi_description -->
+<!-- stop_ppi_description -->
 
 ## Contributing
 
diff --git a/setup.py b/setup.py
index 1809df9fc..d37059603 100755
--- a/setup.py
+++ b/setup.py
@@ -42,13 +42,18 @@ def make_ezipfile(base_name, base_dir, verbose=0, dry_run=0, **kwargs):
 archive_util.ARCHIVE_FORMATS["ezip"] = (
     make_ezipfile, [], 'Executable ZIP file')
 
+
 def get_long_description():
     try:
         with io.open(os.path.join(os.path.dirname(__file__), "README.md"), encoding="utf-8") as f:
-            return f.read().partition("<!--- stop_ppi_description -->")[0]
+            readme = f.read()
+            desc = readme.partition("<!-- start_ppi_description -->")[2]
+            desc = desc.partition("<!-- stop_ppi_description -->")[0]
+            return desc.strip()
     except IOError:
         return None
 
+
 SCRIPTS = ['bin/scapy', 'bin/UTscapy']
 # On Windows we also need additional batch files to run the above scripts
 if os.name == "nt":