diff --git a/README.md b/README.md
index 465d9af57..a4eb4403e 100644
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ Web services supported so far:
 ------------------------------
 
 AFIP:
+
  * [WSAA][10]: authorization & authentication, including digital cryptographic signature
  * [WSFEv1][11]: domestic market (electronic invoice) -[English][12]-
  * [WSMTXCA][22]: domestic market (electronic invoice) -detailing articles and barcodes-
@@ -55,12 +56,14 @@ AFIP:
  * [wDigDepFiel][18]: customs (faithful depositary)
  * [WSCOC][19]: currency exchange operations autorization
  * [WSCDC][22]: invoice verification
- * [Taxpayers' Registe][26]: 
+ * [Taxpayers' Registe][26]: database to check sellers and buyers register
 
 ARBA:
+
  * [COT][20]: Provincial Operation Transport Code (aka electronic Shipping note)
 
 ANMAT/SEDRONAR/SENASA (SNT):
+
  * [TrazaMed][21]: National Medical Drug Traceability Program
  * [TrazaRenpre][24]: Controlled Chemical Precursors Traceability Program
  * [TrazaFito][25]: Phytosanitary Products Traceability Program
diff --git a/setup.py b/setup.py
index fa64aefdf..dc7cd8980 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,16 @@
              "RENPRE (Trazabilidad de Precursores Químicos), "
              "ARBA (Remito Electrónico)")
 
+# convert the README and format in restructured text (only when registering)
+if os.path.exists("README.md"):
+    try:
+        cmd = ['pandoc', '--from=markdown', '--to=rst', 'README.md']
+        long_desc = subprocess.check_output(cmd).decode("utf8")
+        print "Long DESC", long_desc
+    except Exception as e:
+        warnings.warn("Exception when converting the README format: %s" % e)
+
+
 data_files = [
     (".", ["licencia.txt",]),
     ("conf", ["conf/rece.ini", "conf/geotrust.crt", "conf/afip_ca_info.crt", ]),
@@ -433,7 +443,8 @@
     __version__ += "-homo" if HOMO else "-full"
     
 else:
-    desc = "Paquete PyAfipWs"
+    desc = ("Interfases, tools and apps for Argentina's gov't. webservices "
+            "(soap, com/dll, pdf, dbf, xml, etc.)")
     kwargs['package_dir'] = {'pyafipws': '.'}
     kwargs['packages'] = ['pyafipws']
     opts = {}