diff --git a/programming/language/python/sip/actions.py b/programming/language/python/sip/actions.py
index 4ef8232360..b8019f4cb9 100644
--- a/programming/language/python/sip/actions.py
+++ b/programming/language/python/sip/actions.py
@@ -15,8 +15,7 @@ WorkDir = "sip-%s" % get.srcVERSION()
 py2dir = get.curPYTHON()
 py3dir = "python3.4"
 
-def setup():
-    shelltools.system("find . -type f -exec sed -i 's/Python.h/python3.4m\/Python.h/g' {} \;")
+def setup():    
     shelltools.cd("..")
     shelltools.makedirs("build_python3")
     shelltools.copytree("./%s" % WorkDir,  "build_python3")
@@ -24,6 +23,7 @@ def setup():
     pythonmodules.run('configure.py CFLAGS+="%s" CXXFLAGS+="%s"' % (get.CFLAGS(), get.CXXFLAGS()))
 
     shelltools.cd("../build_python3/%s" % WorkDir)
+    shelltools.system("find . -type f -exec sed -i 's/Python.h/python3.4m\/Python.h/g' {} \;")
     pythonmodules.run('configure.py CFLAGS="%s" CXXFLAGS="%s"' % (get.CFLAGS(), get.CXXFLAGS()), pyVer = "3")
                         
 
diff --git a/programming/language/python/sip/pspec.xml b/programming/language/python/sip/pspec.xml
index 774fd4d3f9..d039a42550 100644
--- a/programming/language/python/sip/pspec.xml
+++ b/programming/language/python/sip/pspec.xml
@@ -13,73 +13,36 @@
         <Archive sha1sum="c0a09aa63523293c5ca39444746b1cef1253a0c5" type="targz">mirrors://sourceforge/pyqt/sip-4.16.9.tar.gz</Archive>
         <BuildDependencies>
             <Dependency versionFrom="5.5.1">qt5-base-devel</Dependency>
+            <Dependency>python3-devel</Dependency>
+            <Dependency>python-devel</Dependency>
         </BuildDependencies>
-        <Patches>
-           <!-- <Patch>no-strip.patch</Patch>
-            <Patch>disable-rpaths.diff</Patch>
-            <Patch>fix-linking.diff</Patch>
-            <Patch>sip-outoftree.patch</Patch>-->
-        </Patches>
     </Source>
     <Package>
-        <Name>sip</Name>
+        <Name>python-sip</Name>
+        <Summary>Python 2.x SIP bindings for C and C++ libraries</Summary>
         <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
+            <Dependency>python</Dependency>
         </RuntimeDependencies>
         <Files>
-            <Path fileType="executable">/usr/bin</Path>
-            <Path fileType="data">/usr/share/licenses/sip/LICENSE</Path>
-        </Files>
-        <AdditionalFiles>
-            <!--<AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip/disable-rpaths.diff">disable-rpaths.diff</AdditionalFile>
-            <AdditionalFile group="root" permission="0644" owner="root" target="/usr/share/sip/fix-linking.diff">fix-linking.diff</AdditionalFile>-->
-        </AdditionalFiles>
+            <Path fileType="executable">/usr/bin/py2sip</Path>
+            <Path fileType="library">/usr/lib/python2.7/</Path>
+            <Path fileType="header">/usr/include/python2.7</Path>
+        </Files>        
     </Package>
 
     <Package>
-        <BuildDependencies>
-            <Dependency>python3-devel</Dependency>
-        </BuildDependencies>
         <Name>python3-sip</Name>
-        <Files>
-            <Path fileType="library">/usr/lib/python3*</Path>
-            <Path fileType="data">/usr/share/licenses/python3-sip/LICENSE</Path>
-        </Files>
         <Summary>Python 3.x SIP bindings for C and C++ libraries</Summary>
         <RuntimeDependencies>
             <Dependency>libgcc</Dependency>
             <Dependency>python3</Dependency>
-            <Dependency release="current">sip</Dependency>
         </RuntimeDependencies>
-    </Package>
-
-    <Package>
-        <Name>python-sip</Name>
-        <Summary>Python 2.x SIP bindings for C and C++ libraries</Summary>
-        <BuildDependencies>
-            <Dependency>python-devel</Dependency>
-        </BuildDependencies>
-        <RuntimeDependencies>
-            <Dependency>libgcc</Dependency>
-            <Dependency>python</Dependency>
-            <Dependency release="current">sip</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="library">/usr/lib/python2.7/</Path>
-            <Path fileType="data">/usr/share/licenses/python2-sip/LICENSE</Path>
-        </Files>
-        <Summary>Python 2.x SIP bindings for C and C++ libraries</Summary>
-    </Package>
-
-    <Package>
-        <Name>sip-devel</Name>
-        <Summary>Development files for sip</Summary>
-        <RuntimeDependencies>
-            <Dependency release="current">sip</Dependency>
-        </RuntimeDependencies>
-        <Files>
-            <Path fileType="header">/usr/include/python2.7</Path>
+        <Files>            
+            <Path fileType="executable">/usr/bin/sip</Path>
+            <Path fileType="library">/usr/lib/python3*</Path>
             <Path fileType="header">/usr/include/python3.4m</Path>
+            <Path fileType="data">/usr/share/licenses/python3-sip/LICENSE</Path>
         </Files>
     </Package>