diff --git a/README.rst b/README.rst
index f639539..5aab4b4 100644
--- a/README.rst
+++ b/README.rst
@@ -25,14 +25,15 @@ they ship this module for several package managements.
 Usage
 =====
 
-#. Set otopi environment to enable machine dialect
+1. Set otopi environment to enable machine dialect
 
-  .. code::
+.. code::
+
+  DIALOG/dialect=str:machine
 
-    DIALOG/dialect=str:machine
+2. Spawn desired installer and pass stdin and stdout to parser
 
-#. Spawn desired installer and pass stdin and stdout to parser
-#. Process all otopi events in the loop
+3. Process all otopi events in the loop
 
 Example for oVirt Hosted Engine
 -------------------------------
diff --git a/setup.cfg b/setup.cfg
index 2d459ef..ba0c16f 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -34,3 +34,7 @@ packages=
 [bdist_rpm]
 requires=
     otopi
+[bdist_wheel]
+universal = 1
+[sdist]
+formats = zip,gztar
diff --git a/tox.ini b/tox.ini
index ed8e61d..408243e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,7 @@
 [tox]
 envlist=py26,py27,py34,py35,pep8
 [tox:travis]
-2.6 = py26, pep8
+2.6 = py26
 2.7 = py27, pep8
 3.4 = py34, pep8
 3.5 = py35, pep8