diff --git a/desktop/kde/framework/attica/pspec.xml b/desktop/kde/framework/attica/pspec.xml
index fb0360460c..a923b3fae8 100755
--- a/desktop/kde/framework/attica/pspec.xml
+++ b/desktop/kde/framework/attica/pspec.xml
@@ -15,7 +15,8 @@
         <Archive sha1sum="4163f0b581c16202ca4e134dec6e2069e832ebfd" type="tarxz">http://download.kde.org/stable/frameworks/5.11/attica-5.11.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -23,27 +24,27 @@
         <Name>attica</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>libgcc</Dependency>
+            <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     
     <Package>
         <Name>attica-devel</Name>
-	<Summary>Development files for attica5</Summary>
+        <Summary>Development files for attica5</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">attica</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/cmake</Path>
-	    <Path fileType="config">/usr/lib/pkgconfig</Path>
+            <Path fileType="config">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
 
diff --git a/desktop/kde/plasma/bluez-qt/actions.py b/desktop/kde/framework/bluez-qt/actions.py
similarity index 100%
rename from desktop/kde/plasma/bluez-qt/actions.py
rename to desktop/kde/framework/bluez-qt/actions.py
diff --git a/desktop/kde/plasma/bluez-qt/pspec.xml b/desktop/kde/framework/bluez-qt/pspec.xml
similarity index 74%
rename from desktop/kde/plasma/bluez-qt/pspec.xml
rename to desktop/kde/framework/bluez-qt/pspec.xml
index 0601c3afe3..f734614395 100755
--- a/desktop/kde/plasma/bluez-qt/pspec.xml
+++ b/desktop/kde/framework/bluez-qt/pspec.xml
@@ -14,30 +14,31 @@
         <Description>Qt wrapper for KDE 5 DBus API.</Description>
         <Archive sha1sum="c897f80c8400101b28be3f9ad1250a8c03cd6901" type="tarxz">http://download.kde.org/stable/plasma/5.3.2/bluez-qt-5.3.2.tar.xz</Archive>
         <BuildDependencies>
-        <Dependency>qt5-base-devel</Dependency>	    
-	    <Dependency>extra-cmake-modules</Dependency>
+             <Dependency>qt5-base-devel</Dependency>	    
+             <Dependency>extra-cmake-modules</Dependency>
+             <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>bluez-qt</Name>
         <RuntimeDependencies>
-        <Dependency>qt5-base</Dependency>
-        <Dependency>qt5-declarative</Dependency>
-        <Dependency>libgcc</Dependency>    
-	    </RuntimeDependencies>
+            <Dependency>qt5-base</Dependency>
+            <Dependency>qt5-declarative</Dependency>
+            <Dependency>libgcc</Dependency>    
+        </RuntimeDependencies>
         <Files>
-        <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
-        <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     
     <Package>
         <Name>bluez-qt-devel</Name>
-	<Summary>Development files for bluez-qt</Summary>
+        <Summary>Development files for bluez-qt</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
         <Dependency release="current">bluez-qt</Dependency>	    
         </RuntimeDependencies>
         <Files>
diff --git a/desktop/kde/framework/extra-cmake-modules/pspec.xml b/desktop/kde/framework/extra-cmake-modules/pspec.xml
index e500e515f8..4d50c8c1be 100755
--- a/desktop/kde/framework/extra-cmake-modules/pspec.xml
+++ b/desktop/kde/framework/extra-cmake-modules/pspec.xml
@@ -14,7 +14,8 @@
         <Description>Extra cmake modules KDE5</Description>
         <Archive sha1sum="5c541b28d59de6ef29522282c23a0afc7356d3c7" type="tarxz">http://download.kde.org/stable/frameworks/5.11/extra-cmake-modules-5.11.0.tar.xz</Archive>
         <BuildDependencies>
-	    <Dependency>python-sphinx</Dependency>	    
+            <Dependency>cmake</Dependency>
+            <!--Dependency>python-sphinx</Dependency-->    
         </BuildDependencies>
     </Source>
 
diff --git a/desktop/kde/framework/kactivities/pspec.xml b/desktop/kde/framework/kactivities/pspec.xml
index 63e573cadc..ce012d882f 100755
--- a/desktop/kde/framework/kactivities/pspec.xml
+++ b/desktop/kde/framework/kactivities/pspec.xml
@@ -16,13 +16,13 @@
         <Archive sha1sum="b2f2cf6ddf2060b061248c0ec24f6381ce6917f4" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kactivities-5.11.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>python3</Dependency>
-	    <Dependency>boost-devel</Dependency>
+            <Dependency>python3</Dependency>
+            <Dependency>boost-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
         </BuildDependencies>
-	<Patches>	  
-	  <Patch level="1">build-source.patch</Patch>
-	</Patches>
+        <Patches>	  
+           <Patch level="1">build-source.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>
diff --git a/desktop/kde/framework/karchive/pspec.xml b/desktop/kde/framework/karchive/pspec.xml
index 5a5f6968b5..cfaffec9bb 100755
--- a/desktop/kde/framework/karchive/pspec.xml
+++ b/desktop/kde/framework/karchive/pspec.xml
@@ -15,10 +15,11 @@
         <Archive sha1sum="46f526bded55772c4f9e60bb7fc1891c73479bf2" type="tarxz">http://download.kde.org/stable/frameworks/5.11/karchive-5.11.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>xz-devel</Dependency>
-	    <Dependency>zlib-devel</Dependency>
-	    <Dependency>bzip2</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>xz-devel</Dependency>
+            <Dependency>zlib-devel</Dependency>
+            <Dependency>bzip2</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -26,14 +27,15 @@
         <Name>karchive</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>xz</Dependency>
-	    <Dependency>zlib</Dependency>
-	    <Dependency>bzip2</Dependency>
+            <Dependency>xz</Dependency>
+            <Dependency>zlib</Dependency>
+            <Dependency>bzip2</Dependency>
+            <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
@@ -42,7 +44,7 @@
         <Name>karchive-devel</Name>
 	<Summary>Development files for karchive</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">karchive</Dependency>
         </RuntimeDependencies>
         <Files>
diff --git a/desktop/kde/framework/kcodecs/pspec.xml b/desktop/kde/framework/kcodecs/pspec.xml
index 07b91dd88a..df45241307 100755
--- a/desktop/kde/framework/kcodecs/pspec.xml
+++ b/desktop/kde/framework/kcodecs/pspec.xml
@@ -15,8 +15,9 @@
         <Archive sha1sum="b950224621d9787c5b253c620bd3c29ca5b6844c" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kcodecs-5.11.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>qt5-tools-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>qt5-tools-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -27,24 +28,24 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     
     <Package>
         <Name>kcodecs-devel</Name>
-	<Summary>Development files for kcodecs</Summary>
+        <Summary>Development files for kcodecs</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">kcodecs</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/cmake</Path>
-	    <Path fileType="config">/usr/lib/pkgconfig</Path>
+            <Path fileType="config">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
 
diff --git a/desktop/kde/framework/kconfig/pspec.xml b/desktop/kde/framework/kconfig/pspec.xml
index f2fe8c4f8e..ae9cf7601e 100755
--- a/desktop/kde/framework/kconfig/pspec.xml
+++ b/desktop/kde/framework/kconfig/pspec.xml
@@ -10,20 +10,21 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:console</IsA>
-	<IsA>app:gui</IsA>
+        <IsA>app:console</IsA>
+        <IsA>app:gui</IsA>
         <Summary>Advanced configuration system for KDE Frameworks 5</Summary>
         <Description>Kconfig provides advanced libraries and tools for accessing configuration files.</Description>
         <Archive sha1sum="270e5e006816d59ca3f742bc2392c95a21c2f221" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kconfig-5.11.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>qt5-tools-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>qt5-tools-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
-	<Patches>
-	  <!--<Patch level="1">0001-ensure-platform-window-resize-processing.patch</Patch>
-	  <Patch level="1">session-restore.patch</Patch> -->
-	</Patches>
+       <Patches>
+        <!--<Patch level="1">0001-ensure-platform-window-resize-processing.patch</Patch>
+          <Patch level="1">session-restore.patch</Patch> -->
+       </Patches>
     </Source>
 
     <Package>
@@ -33,19 +34,19 @@
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="executable">/usr/bin</Path>	    
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="executable">/usr/bin</Path>	    
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     
     <Package>
         <Name>kconfig-devel</Name>
-	<Summary>Development files for kconfig</Summary>
+        <Summary>Development files for kconfig</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">kconfig</Dependency>
         </RuntimeDependencies>
         <Files>
diff --git a/desktop/kde/framework/kcoreaddons/pspec.xml b/desktop/kde/framework/kcoreaddons/pspec.xml
index b32a77828b..103285bc4c 100755
--- a/desktop/kde/framework/kcoreaddons/pspec.xml
+++ b/desktop/kde/framework/kcoreaddons/pspec.xml
@@ -18,7 +18,8 @@
             <Dependency>qt5-base-devel</Dependency>            
             <Dependency>qt5-tools-devel</Dependency>
             <Dependency>shared-mime-info</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>        
     </Source>
 
@@ -26,34 +27,34 @@
         <Name>kcoreaddons</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-            <Dependency>gamin</Dependency>
+            <Dependency>libgcc</Dependency>
             <Dependency>shared-mime-info</Dependency>           
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-        <Path fileType="executable">/usr/bin</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     
     <Package>
         <Name>kcoreaddons-devel</Name>
-	<Summary>Development files for kcoreaddons</Summary>
+        <Summary>Development files for kcoreaddons</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">kcoreaddons</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/cmake</Path>
-	    <Path fileType="config">/usr/lib/pkgconfig</Path>
+            <Path fileType="config">/usr/lib/pkgconfig</Path>
         </Files>
-	<Provides>            
-	  <COMAR script="package.py">System.Package</COMAR> 
-	</Provides>
+        <Provides>            
+            <COMAR script="package.py">System.Package</COMAR> 
+        </Provides>
     </Package>
 
     <History>
diff --git a/desktop/kde/framework/kdbusaddons/pspec.xml b/desktop/kde/framework/kdbusaddons/pspec.xml
index ed865c99d5..edc3f34da8 100755
--- a/desktop/kde/framework/kdbusaddons/pspec.xml
+++ b/desktop/kde/framework/kdbusaddons/pspec.xml
@@ -10,14 +10,15 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:console</IsA>
+        <IsA>app:console</IsA>
         <Summary>Extra modules for Qt-DBus</Summary>
         <Description>KDE5-KDBusAddons provides convenience classes on top of QtDBus, as well as an API to create KDED modules.</Description>
         <Archive sha1sum="3afe097162ec6beda589a1dc1abf892ad6729ffb" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kdbusaddons-5.11.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>qt5-tools-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>qt5-tools-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -25,29 +26,29 @@
         <Name>kdbusaddons</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>qt5-x11extras</Dependency>
+            <Dependency>qt5-x11extras</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="executable">/usr/bin</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     
     <Package>
         <Name>kdbusaddons-devel</Name>
-	<Summary>Development files for kdbusaddons</Summary>
+        <Summary>Development files for kdbusaddons</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">kdbusaddons</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/cmake</Path>
-	    <Path fileType="config">/usr/lib/pkgconfig</Path>
+            <Path fileType="config">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
 
diff --git a/desktop/kde/framework/kdnssd/pspec.xml b/desktop/kde/framework/kdnssd/pspec.xml
index 16512f5905..3d30a35cc4 100644
--- a/desktop/kde/framework/kdnssd/pspec.xml
+++ b/desktop/kde/framework/kdnssd/pspec.xml
@@ -15,10 +15,11 @@
         <Archive sha1sum="eef44b91a2c1bd4cf2e5140a381e391bb5c94620" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kdnssd-5.11.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>qt5-tools</Dependency>
+            <Dependency>qt5-tools</Dependency>
             <Dependency>avahi-devel</Dependency>
             <Dependency>avahi-compat-libdns_sd-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -26,22 +27,22 @@
         <Name>kdnssd</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>libgcc</Dependency>
+            <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     
     <Package>
         <Name>kdnssd-devel</Name>
-	<Summary>Development files for kdnssd.</Summary>
+        <Summary>Development files for kdnssd.</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
             <Dependency release="current">kdnssd</Dependency>
         </RuntimeDependencies>
         <Files>
diff --git a/desktop/kde/framework/kguiaddons/pspec.xml b/desktop/kde/framework/kguiaddons/pspec.xml
index a4b77bd037..41939ed6bc 100755
--- a/desktop/kde/framework/kguiaddons/pspec.xml
+++ b/desktop/kde/framework/kguiaddons/pspec.xml
@@ -14,27 +14,32 @@
         <Description>The KDE GUI addons provide utilities for graphical user interfaces in the areas of colors, fonts, text, images, keyboard input. Development files.</Description>
         <Archive sha1sum="1444a735827d295cf0dfb6bc08a3b72518d97e0e" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kguiaddons-5.11.0.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>libxcb-devel</Dependency>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+	    <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
     <Package>
         <Name>kguiaddons</Name>
         <RuntimeDependencies>
+            <Dependency>libX11</Dependency>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>qt5-x11extras</Dependency>
+            <Dependency>qt5-x11extras</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     
     <Package>
         <Name>kguiaddons-devel</Name>
-	<Summary>Development files for kguiaddons</Summary>
+        <Summary>Development files for kguiaddons</Summary>
         <RuntimeDependencies>
             <Dependency release="current">kguiaddons</Dependency>
         </RuntimeDependencies>
diff --git a/desktop/kde/framework/ki18n/pspec.xml b/desktop/kde/framework/ki18n/pspec.xml
index 9b76385055..e35834c2bc 100755
--- a/desktop/kde/framework/ki18n/pspec.xml
+++ b/desktop/kde/framework/ki18n/pspec.xml
@@ -15,8 +15,9 @@
         <Archive sha1sum="0c4751ebc1f3c488f3e95622acf9311e367b7402" type="tarxz">http://download.kde.org/stable/frameworks/5.11/ki18n-5.11.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>python3</Dependency>	    
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>qt5-script-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -24,15 +25,15 @@
         <Name>ki18n</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>qt5-script</Dependency>	    
+            <Dependency>qt5-script</Dependency>	    
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
-	    <Path fileType="man">/usr/share/man</Path>
+            <Path fileType="man">/usr/share/man</Path>
         </Files>
     </Package>
     
diff --git a/desktop/kde/framework/kidletime/pspec.xml b/desktop/kde/framework/kidletime/pspec.xml
index 834d67ce27..9e38bb743d 100755
--- a/desktop/kde/framework/kidletime/pspec.xml
+++ b/desktop/kde/framework/kidletime/pspec.xml
@@ -10,17 +10,20 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:console</IsA>
+        <IsA>app:console</IsA>
         <Summary>Idle time reporting utility</Summary>
         <Description>KIdleTime is a singleton reporting information on idle time. It is useful not only for finding out about the current idle time of the PC, but also for getting notified upon idle time events, such as custom timeouts, or user activity.</Description>
         <Archive sha1sum="8f5abb78d2b8b5a62c60e9b17a88d3345db1f5e9" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kidletime-5.11.0.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>libX11-devel</Dependency>
-	    <Dependency>libgcc</Dependency>
-	    <Dependency>libxcb-devel</Dependency>
+            <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>libXext-devel</Dependency>
+            <Dependency>libXScrnSaver-devel</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libxcb-devel</Dependency>
             <Dependency>extra-cmake-modules</Dependency>
-	    <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -28,17 +31,17 @@
         <Name>kidletime</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>libX11</Dependency>
-	    <Dependency>libgcc</Dependency>
-	    <Dependency>libxcb</Dependency>
-	    <Dependency>libXScrnSaver</Dependency>	    
-	    <Dependency>libXext</Dependency>
-	    <Dependency>qt5-x11extras</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libxcb</Dependency>
+            <Dependency>libXScrnSaver</Dependency>	    
+            <Dependency>libXext</Dependency>
+            <Dependency>qt5-x11extras</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
diff --git a/desktop/kde/framework/kimageformats/pspec.xml b/desktop/kde/framework/kimageformats/pspec.xml
index 0989c6bef9..453949b672 100644
--- a/desktop/kde/framework/kimageformats/pspec.xml
+++ b/desktop/kde/framework/kimageformats/pspec.xml
@@ -10,13 +10,16 @@
         </Packager>
         <License>LGPLv2</License>
         <IsA>library</IsA>
-	<IsA>app:console</IsA>
+        <IsA>app:console</IsA>
         <Summary>Image formats addons for QT 5</Summary>
         <Description>This framework provides additional image format plugins for QtGui. </Description>
         <Archive sha1sum="5bac294ff1088996af8fb90283ddc313cd6622a0" type="tarxz">http://download.kde.org/stable/frameworks/5.11/kimageformats-5.11.0.tar.xz</Archive>
         <BuildDependencies>
-            <Dependency>qt5-base-devel</Dependency>            
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>openexr-devel</Dependency>
+            <Dependency>ilmbase-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -24,14 +27,14 @@
         <Name>kimageformats</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>libgcc</Dependency>
-	    <Dependency>openexr-libs</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>openexr-libs</Dependency>
             <Dependency>ilmbase</Dependency>	    
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
diff --git a/desktop/kde/framework/kwindowsystem/pspec.xml b/desktop/kde/framework/kwindowsystem/pspec.xml
index 64ca5da89b..fe5b783978 100755
--- a/desktop/kde/framework/kwindowsystem/pspec.xml
+++ b/desktop/kde/framework/kwindowsystem/pspec.xml
@@ -17,15 +17,16 @@
         <BuildDependencies>
             <Dependency>qt5-base-devel</Dependency>
             <Dependency>qt5-tools-devel</Dependency>
-	    <Dependency>qt5-x11extras-devel</Dependency>
-	    <Dependency>libX11-devel</Dependency>
-	    <Dependency>libgcc</Dependency>
-	    <Dependency>libxcb-devel</Dependency>
+            <Dependency>qt5-x11extras-devel</Dependency>
+            <Dependency>libX11-devel</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libxcb-devel</Dependency>
             <Dependency>libXrender-devel</Dependency>
             <Dependency>libXfixes-devel</Dependency>	    
-	    <Dependency>xcb-util-devel</Dependency>
-	    <Dependency>xcb-util-keysyms-devel</Dependency>
-	    <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>xcb-util-devel</Dependency>
+            <Dependency>xcb-util-keysyms-devel</Dependency>
+            <Dependency>extra-cmake-modules</Dependency>
+            <Dependency>cmake</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -33,38 +34,38 @@
         <Name>kwindowsystem</Name>
         <RuntimeDependencies>
             <Dependency>qt5-base</Dependency>
-	    <Dependency>libX11</Dependency>
-	    <Dependency>libgcc</Dependency>
-	    <Dependency>libxcb</Dependency>
+            <Dependency>libX11</Dependency>
+            <Dependency>libgcc</Dependency>
+            <Dependency>libxcb</Dependency>
             <Dependency>qt5-x11extras</Dependency>
             <Dependency>libXfixes</Dependency>	    
-	    <Dependency>xcb-util-keysyms</Dependency>
+            <Dependency>xcb-util-keysyms</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="data">/usr/share</Path>
-	    <Path fileType="localedata">/usr/share/locale</Path>
-	    <Path fileType="library">/usr/lib/qt5</Path>
-	    <Path fileType="library">/usr/lib</Path>
-	    <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="localedata">/usr/share/locale</Path>
+            <Path fileType="library">/usr/lib/qt5</Path>
+            <Path fileType="library">/usr/lib</Path>
+            <Path fileType="executable">/usr/bin</Path>
             <Path fileType="doc">/usr/share/doc</Path>
         </Files>
     </Package>
     
     <Package>
         <Name>kwindowsystem-devel</Name>
-	<Summary>Development files for kwindowsystem</Summary>
+        <Summary>Development files for kwindowsystem</Summary>
         <RuntimeDependencies>
-	    <Dependency>qt5-base-devel</Dependency>
-	    <Dependency>libXrender-devel</Dependency>
+            <Dependency>qt5-base-devel</Dependency>
+            <Dependency>libXrender-devel</Dependency>
             <Dependency>libXfixes-devel</Dependency>	    
-	    <Dependency>xcb-util-devel</Dependency>
-	    <Dependency>xcb-util-keysyms-devel</Dependency>
+            <Dependency>xcb-util-devel</Dependency>
+            <Dependency>xcb-util-keysyms-devel</Dependency>
             <Dependency release="current">kwindowsystem</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
             <Path fileType="data">/usr/lib/cmake</Path>
-	    <Path fileType="config">/usr/lib/pkgconfig</Path>
+            <Path fileType="config">/usr/lib/pkgconfig</Path>
         </Files>
     </Package>
 
diff --git a/desktop/misc/shared-mime-info/actions.py b/desktop/misc/shared-mime-info/actions.py
new file mode 100644
index 0000000000..1ee8180a62
--- /dev/null
+++ b/desktop/misc/shared-mime-info/actions.py
@@ -0,0 +1,26 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+
+def setup():
+    # https://bugs.freedesktop.org/show_bug.cgi?id=70366
+    shelltools.export("ac_cv_func_fdatasync", "no")
+
+    autotools.configure("--disable-update-mimedb")
+
+def build():
+    autotools.make('-j1')
+
+def check():
+    autotools.make("check")
+
+def install():
+    autotools.install()
+
+    pisitools.dodoc("ChangeLog", "NEWS", "README")
diff --git a/desktop/misc/shared-mime-info/comar/package.py b/desktop/misc/shared-mime-info/comar/package.py
new file mode 100644
index 0000000000..81fb2db012
--- /dev/null
+++ b/desktop/misc/shared-mime-info/comar/package.py
@@ -0,0 +1,7 @@
+#!/usr/bin/python
+
+import os
+
+# Update global mime databases, mime database format may change (0.70)
+def postInstall(fromVersion, fromRelease, toVersion, toRelease):
+    os.system("/usr/bin/update-mime-database /usr/share/mime")
diff --git a/desktop/misc/shared-mime-info/comar/pakhandler.py b/desktop/misc/shared-mime-info/comar/pakhandler.py
new file mode 100644
index 0000000000..226588331a
--- /dev/null
+++ b/desktop/misc/shared-mime-info/comar/pakhandler.py
@@ -0,0 +1,24 @@
+#!/usr/bin/python
+
+import piksemel
+import os
+
+def updateMimeTypes(filepath):
+    parse = piksemel.parse(filepath)
+    paths = set()
+    for icon in parse.tags("File"):
+        path = icon.getTagData("Path")
+        if "/share/mime/packages/" in path and path.endswith(".xml"):
+            paths.add("/%s" % path.partition("packages/")[0])
+
+    for p in paths:
+        os.system("/usr/bin/update-mime-database %s" % p)
+
+def setupPackage(metapath, filepath):
+    updateMimeTypes(filepath)
+
+def cleanupPackage(metapath, filepath):
+    pass
+
+def postCleanupPackage(metapath, filepath):
+    updateMimeTypes(filepath)
diff --git a/desktop/misc/shared-mime-info/files/defaults.list b/desktop/misc/shared-mime-info/files/defaults.list
new file mode 100644
index 0000000000..0055014a32
--- /dev/null
+++ b/desktop/misc/shared-mime-info/files/defaults.list
@@ -0,0 +1,267 @@
+[Default Applications]
+
+application/x-dia-diagram=dia.desktop
+text/x-vcard=evolution.desktop
+text/directory=evolution.desktop
+text/calendar=evolution.desktop
+application/x-cd-image=gnome-disk-image-mounter.desktop
+image/x-compressed-xcf=gimp.desktop
+image/x-xcf=gimp.desktop
+image/x-psd=gimp.desktop
+image/x-fits=gimp.desktop
+image/bmp=eog.desktop;gthumb.desktop;
+image/gif=eog.desktop;gthumb.desktop;
+image/x-icb=eog.desktop;gthumb.desktop;
+image/x-ico=eog.desktop;gthumb.desktop;
+image/x-pcx=eog.desktop;gthumb.desktop;
+image/x-portable-anymap=eog.desktop;gthumb.desktop;
+image/x-portable-bitmap=eog.desktop;gthumb.desktop;
+image/x-portable-graymap=eog.desktop;gthumb.desktop;
+image/x-portable-pixmap=eog.desktop;gthumb.desktop;
+image/x-xbitmap=eog.desktop;gthumb.desktop;
+image/x-xpixmap=eog.desktop;gthumb.desktop;
+image/x-xwindowdump=eog.desktop;gthumb.desktop;
+image/svg+xml=eog.desktop;gthumb.desktop;
+application/vnd.ms-word=libreoffice-writer.desktop
+application/vnd.wordperfect=libreoffice-writer.desktop
+application/vnd.sun.xml.writer=libreoffice-writer.desktop
+application/vnd.sun.xml.writer.global=libreoffice-writer.desktop
+application/vnd.sun.xml.writer.template=libreoffice-writer.desktop
+application/vnd.stardivision.writer=libreoffice-writer.desktop
+application/vnd.oasis.opendocument.text=libreoffice-writer.desktop
+application/vnd.oasis.opendocument.text-template=libreoffice-writer.desktop
+application/vnd.oasis.opendocument.text-web=libreoffice-writer.desktop
+application/vnd.oasis.opendocument.text-master=libreoffice-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=libreoffice-writer.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.template=libreoffice-writer.desktop
+application/vnd.ms-excel=libreoffice-calc.desktop
+application/vnd.stardivision.calc=libreoffice-calc.desktop
+application/vnd.sun.xml.calc=libreoffice-calc.desktop
+application/vnd.sun.xml.calc.template=libreoffice-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=libreoffice-calc.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.template=libreoffice-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet=libreoffice-calc.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=libreoffice-calc.desktop
+application/vnd.ms-powerpoint=libreoffice-impress.desktop
+application/vnd.stardivision.impress=libreoffice-impress.desktop
+application/vnd.sun.xml.impress=libreoffice-impress.desktop
+application/vnd.sun.xml.impress.template=libreoffice-impress.desktop
+application/vnd.oasis.opendocument.presentation=libreoffice-impress.desktop
+application/vnd.oasis.opendocument.presentation-template=libreoffice-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.presentation=libreoffice-impress.desktop
+application/vnd.openxmlformats-officedocument.presentationml.template=libreoffice-impress.desktop
+application/vnd.stardivision.draw=libreoffice-draw.desktop
+application/vnd.sun.xml.draw=libreoffice-draw.desktop
+application/vnd.sun.xml.draw.template=libreoffice-draw.desktop
+application/vnd.oasis.opendocument.graphics=libreoffice-draw.desktop
+application/vnd.oasis.opendocument.graphics-template=libreoffice-draw.desktop
+application/vnd.oasis.opendocument.formula=libreoffice-math.desktop
+application/vnd.sun.xml.math=libreoffice-math.desktop
+application/vnd.stardivision.math=libreoffice-math.desktop
+application/vnd.oasis.opendocument.database=libreoffice-base.desktop
+application/vnd.sun.xml.base=libreoffice-base.desktop
+application/pdf=evince.desktop
+application/postscript=evince.desktop
+application/x-qw=gnome-gnucash.desktop
+application/x-gnucash=gnome-gnucash.desktop
+application/vnd.lotus-1-2-3=gnumeric.desktop
+application/x-oleo=gnumeric.desktop
+application/x-gnumeric=gnumeric.desktop
+application/x-xbase=gnumeric.desktop
+application/x-abiword=abiword.desktop
+application/x-dvi=evince.desktop
+application/x-catalog=gpk-install-catalog.desktop
+application/x-rpm=gpk-install-local-file.desktop
+text/plain=gedit.desktop
+text/html=firefox.desktop
+application/xhtml+xml=firefox.desktop
+inode/directory=nautilus.desktop
+x-content/blank-cd=brasero-nautilus.desktop
+x-content/blank-dvd=brasero-nautilus.desktop
+x-content/blank-bd=brasero-nautilus.desktop
+x-content/blank-hddvd=brasero-nautilus.desktop
+x-content/video-dvd=totem.desktop
+x-content/video-vcd=totem.desktop
+x-content/video-svcd=totem.desktop
+#x-content/video-bluray=totem.desktop
+#x-content/video-hddvd=totem.desktop
+x-content/audio-cdda=rhythmbox.desktop
+x-content/audio-dvd=rhythmbox.desktop
+x-content/audio-player=rhythmbox.desktop
+x-content/image-dcf=shotwell.desktop
+x-content/image-picturecd=shotwell.desktop
+# URI scheme handlers
+x-scheme-handler/mailto=evolution.desktop
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+application/x-java-jnlp-file=javaws.desktop
+
+application/csv=ooo-spreadsheet.desktop
+application/doc=ooo-textdoc.desktop
+application/dot=ooo-textdoc.desktop
+application/excel=ooo-spreadsheet.desktop
+application/mdb=ooo-database.desktop
+application/ms-access=ooo-database.desktop
+application/ms-excel=ooo-spreadsheet.desktop
+application/ms-powerpoint=ooo-presentation.desktop
+application/ms-word=ooo-textdoc.desktop
+application/msaccess=ooo-database.desktop
+application/msexcel=ooo-spreadsheet.desktop
+application/mspowerpoint=ooo-presentation.desktop
+application/msword=ooo-textdoc.desktop
+application/rtf=ooo-textdoc.desktop
+application/tab-separated-values=ooo-spreadsheet.desktop
+application/vnd.lotus-1-2-3=ooo-spreadsheet.desktop
+application/vnd.ms-excel=ooo-spreadsheet.desktop
+application/vnd.ms-powerpoint=ooo-presentation.desktop
+application/vnd.ms-pps=ooo-presentation.desktop
+application/vnd.ms-word=ooo-textdoc.desktop
+application/vnd.oasis.opendocument.database=ooo-database.desktop
+application/vnd.oasis.opendocument.graphics=ooo-drawing.desktop
+application/vnd.oasis.opendocument.presentation-template=ooo-presentation.desktop
+application/vnd.oasis.opendocument.presentation=ooo-presentation.desktop
+application/vnd.oasis.opendocument.spreadsheet-template=ooo-spreadsheet.desktop
+application/vnd.oasis.opendocument.spreadsheet=ooo-spreadsheet.desktop
+application/vnd.oasis.opendocument.text-master=ooo-textdoc.desktop
+application/vnd.oasis.opendocument.text-template=ooo-textdoc.desktop
+application/vnd.oasis.opendocument.text-web=ooo-web.desktop
+application/vnd.oasis.opendocument.text=ooo-textdoc.desktop
+application/vnd.openofficeorg.extension=ooo-extension-manager.desktop
+application/vnd.openxmlformats-officedocument.presentationml.presentation=ooo-presentation.desktop
+application/vnd.openxmlformats-officedocument.spreadsheetml.sheet=ooo-spreadsheet.desktop
+application/vnd.openxmlformats-officedocument.wordprocessingml.document=ooo-textdoc.desktop
+application/vnd.stardivision.calc=ooo-spreadsheet.desktop
+application/vnd.stardivision.draw=ooo-drawing.desktop
+application/vnd.stardivision.impress=ooo-presentation.desktop
+application/vnd.stardivision.writer=ooo-textdoc.desktop
+application/vnd.sun.xml.calc.template=ooo-spreadsheet.desktop
+application/vnd.sun.xml.calc=ooo-spreadsheet.desktop
+application/vnd.sun.xml.base=ooo-database.desktop
+application/vnd.sun.xml.draw.template=ooo-drawing.desktop
+application/vnd.sun.xml.draw=ooo-drawing.desktop
+application/vnd.sun.xml.impress.template=ooo-presentation.desktop
+application/vnd.sun.xml.impress=ooo-presentation.desktop
+application/vnd.sun.xml.writer.global=ooo-textdoc.desktop
+application/vnd.sun.xml.writer=ooo-textdoc.desktop
+application/vnd.wordperfect=ooo-textdoc.desktop
+application/vnd.x-ms-word=ooo-textdoc.desktop
+application/vnd.x-msaccess=ooo-database.desktop
+application/vnd.x-mspowerpoint=ooo-presentation.desktop
+application/x-dot=ooo-textdoc.desktop
+application/x-excel=ooo-spreadsheet.desktop
+application/x-mdb=ooo-database.desktop
+application/x-mps=ooo-spreadsheet.desktop
+application/x-ms-excel=ooo-spreadsheet.desktop
+application/x-msaccess=ooo-database.desktop
+application/x-msexcel=ooo-spreadsheet.desktop
+application/x-mspowerpoint=ooo-presentation.desktop
+application/x-msword=ooo-textdoc.desktop
+application/x-planperfect=ooo-spreadsheet.desktop
+application/x-powerpoint=ooo-presentation.desktop
+application/x-rtf=ooo-textdoc.desktop
+application/x-sc=ooo-spreadsheet.desktop
+application/x-xls=ooo-spreadsheet.desktop
+application/xls=ooo-spreadsheet.desktop
+text/comma-separated-values=ooo-spreadsheet.desktop
+text/csv=ooo-spreadsheet.desktop
+text/richtext=ooo-textdoc.desktop
+text/rtf=ooo-textdoc.desktop
+text/spreadsheet=ooo-spreadsheet.desktop
+text/tab-separated-values=ooo-spreadsheet.desktop
+text/x-comma-separated-values=ooo-spreadsheet.desktop
+zz-application/zz-winassoc-xls=ooo-spreadsheet.desktop
+
+application/ogg=gnome-mplayer.desktop
+application/x-extension-m4a=gnome-mplayer.desktop
+application/x-extension-mp4=gnome-mplayer.desktop
+application/x-flac=gnome-mplayer.desktop
+application/x-matroska=gnome-mplayer.desktop
+application/x-ogg=gnome-mplayer.desktop
+application/x-shockwave-flash=gnome-mplayer.desktop
+audio/mpeg=gnome-mplayer.desktop
+audio/mpegurl=gnome-mplayer.desktop
+audio/vnd.rn-realaudio=gnome-mplayer.desktop
+audio/x-flac=gnome-mplayer.desktop
+audio/x-m4a=gnome-mplayer.desktop
+audio/x-mp3-playlist=gnome-mplayer.desktop
+audio/x-mp3=gnome-mplayer.desktop
+audio/x-mpeg=gnome-mplayer.desktop
+audio/x-mpegurl=gnome-mplayer.desktop
+audio/x-ms-asf=gnome-mplayer.desktop
+audio/x-ms-asx=gnome-mplayer.desktop
+audio/x-ms-wax=gnome-mplayer.desktop
+audio/x-pn-aiff=gnome-mplayer.desktop
+audio/x-pn-au=gnome-mplayer.desktop
+audio/x-pn-realaudio-plugin=gnome-mplayer.desktop
+audio/x-pn-realaudio=gnome-mplayer.desktop
+audio/x-pn-wav=gnome-mplayer.desktop
+audio/x-pn-windows-acm=gnome-mplayer.desktop
+audio/x-real-audio=gnome-mplayer.desktop
+audio/x-scpls=gnome-mplayer.desktop
+audio/x-wav=gnome-mplayer.desktop
+dio/ogg=gnome-mplayer.desktop
+image/vnd.rn-realpix=gnome-mplayer.desktop
+misc/ultravox=gnome-mplayer.desktop
+video/dv=gnome-mplayer.desktop
+video/mp4=gnome-mplayer.desktop
+video/mpeg=gnome-mplayer.desktop
+video/msvideo=gnome-mplayer.desktop
+video/ogg=gnome-mplayer.desktop
+video/quicktime=gnome-mplayer.desktop
+video/vnd.rn-realvideo=gnome-mplayer.desktop
+video/x-anim=gnome-mplayer.desktop
+video/x-avi=gnome-mplayer.desktop
+video/x-flc=gnome-mplayer.desktop
+video/x-fli=gnome-mplayer.desktop
+video/x-mpeg=gnome-mplayer.desktop
+video/x-ms-asf=gnome-mplayer.desktop
+video/x-ms-wmv=gnome-mplayer.desktop
+video/x-msv=gnome-mplayer.desktop
+video/x-msvideo=gnome-mplayer.desktop
+video/x-nsv=gnome-mplayer.desktop
+x-content/audio-cdda=gnome-mplayer.desktop
+x-content/audio-dvd=gnome-mplayer.desktop
+x-content/audio-player=gnome-mplayer.desktop
+#x-content/image-dcf=
+#x-content/image-picturecd=
+x-content/video-blueray=gnome-mplayer.desktop
+x-content/video-dvd=gnome-mplayer.desktop
+x-content/video-hddvd=gnome-mplayer.desktop
+x-content/video-svcd=gnome-mplayer.desktop
+x-content/video-vcd=gnome-mplayer.desktop
+
+image/x-gray=gimp.desktop
+image/x-icb=gimp.desktop
+image/x-pcx=gimp.desktop
+image/x-portable-anymap=gimp.desktop
+image/x-portable-graymap=gimp.desktop
+image/x-psd=gimp.desktop
+image/x-xcf=gimp.desktop
+image/x-xwindowdump=gimp.desktop
+
+text/html=mozillafirefox.desktop;ooo-web.desktop
+application/xhtml+xml=mozillafirefox.desktop;ooo-textdoc.desktop
+
+#text/x-vcalendar=evolution.desktop
+#text/x-vcard=evolution.desktop
+#text/calendar=evolution.desktop
+
+#application/x-abiword=abiword.desktop
+#application/x-applix-spreadsheet=gnumeric.desktop
+#text/abiword=abiword.desktop
+
+#application/x-dia-diagram=dia.desktop
+#application/x-dos_ms_excel=gnumeric.desktop
+#application/x-glade=glade-2.desktop
+#application/x-gnucash=gnucash.desktop
+#application/x-gnumeric=gnumeric.desktop
+#application/x-oleo=gnumeric.desktop
+#application/x-quattropro=gnumeric.desktop
+#application/x-sylk=gnumeric.desktop
+#application/x-xbase=gnumeric.desktop
+
+
+x-scheme-handler/http=mozillafirefox.desktop;chromium-browser.desktop
+x-scheme-handler/https=mozillafirefox.desktop;chromium-browser.desktop
+x-scheme-handler/mailto=kde4-kmailservice.desktop;
diff --git a/desktop/misc/shared-mime-info/files/file-roller-defaults.list b/desktop/misc/shared-mime-info/files/file-roller-defaults.list
new file mode 100644
index 0000000000..9bb9fb9efe
--- /dev/null
+++ b/desktop/misc/shared-mime-info/files/file-roller-defaults.list
@@ -0,0 +1,50 @@
+application/x-7z-compressed=file-roller.desktop;
+application/x-7z-compressed-tar=file-roller.desktop;
+application/x-ace=file-roller.desktop;
+application/x-alz=file-roller.desktop;
+application/x-ar=file-roller.desktop;
+application/x-arj=file-roller.desktop;
+application/x-bzip=file-roller.desktop;
+application/x-bzip-compressed-tar=file-roller.desktop;
+application/x-bzip1=file-roller.desktop;
+application/x-bzip1-compressed-tar=file-roller.desktop;
+application/x-cabinet=file-roller.desktop;
+application/x-cbr=file-roller.desktop;
+application/x-cbz=file-roller.desktop;
+application/x-compress=file-roller.desktop;
+application/x-compressed-tar=file-roller.desktop;
+application/x-cpio=file-roller.desktop;
+application/x-deb=file-roller.desktop;
+application/x-ear=file-roller.desktop;
+application/x-ms-dos-executable=file-roller.desktop;
+application/x-gtar=file-roller.desktop;
+application/x-gzip=file-roller.desktop;
+application/x-gzpostscript=file-roller.desktop;
+application/x-java-archive=file-roller.desktop;
+application/x-lha=file-roller.desktop;
+application/x-lhz=file-roller.desktop;
+application/x-lrzip=file-roller.desktop;
+application/x-lrzip-compressed-tar=file-roller.desktop;
+application/x-lzip=file-roller.desktop;
+application/x-lzip-compressed-tar=file-roller.desktop;
+application/x-lzma=file-roller.desktop;
+application/x-lzma-compressed-tar=file-roller.desktop;
+application/x-lzop=file-roller.desktop;
+application/x-lzop-compressed-tar=file-roller.desktop;
+application/x-ms-wim=file-roller.desktop;
+application/x-rar=file-roller.desktop;
+application/x-rar-compressed=file-roller.desktop;
+application/x-rzip=file-roller.desktop;
+application/x-tar=file-roller.desktop;
+application/x-tarz=file-roller.desktop;
+application/x-stuffit=file-roller.desktop;
+application/x-war=file-roller.desktop;
+application/x-xz=file-roller.desktop;
+application/x-xz-compressed-tar=file-roller.desktop;
+application/x-zip=file-roller.desktop;
+application/x-zip-compressed=file-roller.desktop;
+application/x-zoo=file-roller.desktop;
+application/zip=file-roller.desktop;
+application/x-archive=file-roller.desktop;
+application/vnd.ms-cab-compressed=file-roller.desktop;
+application/x-source-rpm=file-roller.desktop;
diff --git a/desktop/misc/shared-mime-info/files/mimeapps.list b/desktop/misc/shared-mime-info/files/mimeapps.list
new file mode 100644
index 0000000000..59503a9f5b
--- /dev/null
+++ b/desktop/misc/shared-mime-info/files/mimeapps.list
@@ -0,0 +1,3 @@
+[Added Associations]
+application/xhtml+xml=mozillafirefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;ooo-web.desktop;
+text/html=mozillafirefox.desktop;kde4-kfmclient_html.desktop;kde4-kwrite.desktop;ooo-web.desktop;
diff --git a/desktop/misc/shared-mime-info/files/mimetypefixes.xml b/desktop/misc/shared-mime-info/files/mimetypefixes.xml
new file mode 100644
index 0000000000..17b88f781e
--- /dev/null
+++ b/desktop/misc/shared-mime-info/files/mimetypefixes.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Notes: This is a fix to set .iso files to let media-burner,media-player and/or archiver
+take priority over pattern that is found inside those files that somehow matches the text/plain
+mimetype -->
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+<mime-type type="application/x-cd-image">
+<comment>raw CD image</comment>
+<comment xml:lang="ar">صورة CD خامة</comment>
+<comment xml:lang="be@latin">suvoraja vyjava CD</comment>
+<comment xml:lang="bg">Изображение — raw CD</comment>
+<comment xml:lang="ca">imatge de CD en cru</comment>
+<comment xml:lang="cs">Surový obraz CD</comment>
+<comment xml:lang="da">rå cd-aftryk</comment>
+<comment xml:lang="de">CD-Roh-Abbild</comment>
+<comment xml:lang="el">εικόνα περιεχομένου ψηφιακού δίσκου</comment>
+<comment xml:lang="en_GB">raw CD image</comment>
+<comment xml:lang="eo">kruda lumdiskbildo</comment>
+<comment xml:lang="es">imagen de CD en bruto</comment>
+<comment xml:lang="eu">CD gordinaren irudia </comment>
+<comment xml:lang="fi">raaka CD-vedos</comment>
+<comment xml:lang="fo">rá CD mynd</comment>
+<comment xml:lang="fr">image CD brute</comment>
+<comment xml:lang="ga">amhíomhá dhlúthdhiosca</comment>
+<comment xml:lang="gl">imaxe de CD en bruto</comment>
+<comment xml:lang="he">תמונת דיסק גולמית</comment>
+<comment xml:lang="hu">nyers CD-lemezkép</comment>
+<comment xml:lang="id">citra CD mentah</comment>
+<comment xml:lang="it">Immagine raw CD</comment>
+<comment xml:lang="ja">生 CD イメージ</comment>
+<comment xml:lang="kk">өңделмеген CD бейнесі</comment>
+<comment xml:lang="ko">CD 이미지</comment>
+<comment xml:lang="lt">raw CD atvaizdis</comment>
+<comment xml:lang="lv">CD jēlattēls</comment>
+<comment xml:lang="ms">Imej CD mentah</comment>
+<comment xml:lang="nb">rått CD-bilde</comment>
+<comment xml:lang="nl">ruw CD-beeldbestand</comment>
+<comment xml:lang="nn">rått CD-bilete</comment>
+<comment xml:lang="pl">Surowy obraz CD</comment>
+<comment xml:lang="pt">imagem em bruto de CD</comment>
+<comment xml:lang="pt_BR">Imagem bruta de CD</comment>
+<comment xml:lang="ro">imagine de CD brută</comment>
+<comment xml:lang="ru">образ компакт-диска</comment>
+<comment xml:lang="sk">Surový obraz CD</comment>
+<comment xml:lang="sl">surovi CD odtis</comment>
+<comment xml:lang="sq">Imazh raw CD</comment>
+<comment xml:lang="sr">сирови отисак ЦД-а</comment>
+<comment xml:lang="sv">rå cd-avbild</comment>
+<comment xml:lang="uk">образ raw CD</comment>
+<comment xml:lang="vi">ảnh đĩa CD thô</comment>
+<comment xml:lang="zh_CN">原始 CD 映像</comment>
+<comment xml:lang="zh_TW">原生 CD 映像</comment>
+<sub-class-of type="application/x-raw-disk-image"/>
+<alias type="application/x-iso9660-image"/>
+<glob weight="60" pattern="*.iso"/>
+<glob weight="60" pattern="*.iso9660"/>
+</mime-type>
+</mime-info> 
diff --git a/desktop/misc/shared-mime-info/files/shared-mime-info-xz.patch b/desktop/misc/shared-mime-info/files/shared-mime-info-xz.patch
new file mode 100644
index 0000000000..5c833f9c0f
--- /dev/null
+++ b/desktop/misc/shared-mime-info/files/shared-mime-info-xz.patch
@@ -0,0 +1,87 @@
+--- shared-mime-info-0.60/freedesktop.org.xml.in.orig	2009-04-17 11:46:23.000000000 -0300
++++ shared-mime-info-0.60/freedesktop.org.xml.in	2009-04-17 11:49:36.000000000 -0300
+@@ -1990,6 +1990,19 @@
+     <glob pattern="*.tar.lzma"/>
+     <glob pattern="*.tlz"/>
+   </mime-type>
++  <mime-type type="application/x-xz">
++    <_comment>XZ archive</_comment>
++    <acronym>XZ</acronym>
++    <expanded-acronym>XZ Algorithm</expanded-acronym>
++    <generic-icon name="package-x-generic"/>
++    <glob pattern="*.xz"/>
++  </mime-type>
++  <mime-type type="application/x-xz-compressed-tar">
++    <_comment>Tar archive (XZ-compressed)</_comment>
++    <generic-icon name="package-x-generic"/>
++    <glob pattern="*.tar.xz"/>
++    <glob pattern="*.txz"/>
++  </mime-type>
+   <mime-type type="application/x-lzop">
+     <_comment>LZO archive</_comment>
+     <generic-icon name="package-x-generic"/>
+--- shared-mime-info-0.60/freedesktop.org.xml	2009-02-21 11:08:16.000000000 -0300
++++ shared-mime-info-0.60/freedesktop.org.xml.orig	2009-04-17 11:51:46.000000000 -0300
+@@ -7314,6 +7314,55 @@
+     <glob pattern="*.tar.lzma"/>
+     <glob pattern="*.tlz"/>
+   </mime-type>
++  <mime-type type="application/x-xz">
++    <comment>xz archive</comment>
++    <comment xml:lang="be@latin">Archiŭ xz</comment>
++    <comment xml:lang="ca">arxiu xz</comment>
++    <comment xml:lang="cs">Archiv xz</comment>
++    <comment xml:lang="es">archivador xz</comment>
++    <comment xml:lang="fi">xz-arkisto</comment>
++    <comment xml:lang="fr">archive xz</comment>
++    <comment xml:lang="ga">cartlann xz</comment>
++    <comment xml:lang="hu">xz-archívum</comment>
++    <comment xml:lang="id">Arsip xz</comment>
++    <comment xml:lang="it">Archivio xz</comment>
++    <comment xml:lang="ko">xz 압축파일</comment>
++    <comment xml:lang="lt">xz archyvas</comment>
++    <comment xml:lang="nb">xz-arkiv</comment>
++    <comment xml:lang="nl">xz-archief</comment>
++    <comment xml:lang="pt_BR">Pacote xz</comment>
++    <comment xml:lang="ru">архив xz</comment>
++    <comment xml:lang="sv">xz-arkiv</comment>
++    <comment xml:lang="vi">Kho nén xz</comment>
++    <acronym>xz</acronym>
++    <expanded-acronym>XZ Algorithm</expanded-acronym>
++    <generic-icon name="package-x-generic"/>
++    <glob pattern="*.xz"/>
++  </mime-type>
++  <mime-type type="application/x-xz-compressed-tar">
++    <comment>Tar archive (xz-compressed)</comment>
++    <comment xml:lang="be@latin">Archiŭ tar (xz-skampresavany)</comment>
++    <comment xml:lang="ca">arxiu tar (comprimit amb xz)</comment>
++    <comment xml:lang="cs">Archiv tar (komprimovaný pomocí xz)</comment>
++    <comment xml:lang="es">archivador Tar (comprimido con xz)</comment>
++    <comment xml:lang="fi">Tar-arkisto (xz-pakattu)</comment>
++    <comment xml:lang="fr">archive tar (compression xz)</comment>
++    <comment xml:lang="ga">cartlann Tar (comhbhrúite le xz)</comment>
++    <comment xml:lang="hu">Tar archívum (xz-val tömörítve)</comment>
++    <comment xml:lang="id">Arsip Tar (terkompresi xz)</comment>
++    <comment xml:lang="it">Archivio tar (compresso con xz)</comment>
++    <comment xml:lang="ko">(xz로 압축한) tar 묶음파일</comment>
++    <comment xml:lang="lt">Tar archyvas (suglaudintas su xz)</comment>
++    <comment xml:lang="nb">Tar-arkiv (xz-komprimert)</comment>
++    <comment xml:lang="nl">Tar-archief (ingepakt met xz)</comment>
++    <comment xml:lang="pt_BR">Pacote tar (compactado com LZO)</comment>
++    <comment xml:lang="ru">архив tar (сжатый xz)</comment>
++    <comment xml:lang="sv">Tar-arkiv (xz-komprimerat)</comment>
++    <comment xml:lang="vi">Kho nén tar (đã nén xz)</comment>
++    <generic-icon name="package-x-generic"/>
++    <glob pattern="*.tar.xz"/>
++    <glob pattern="*.txz"/>
++  </mime-type>
+   <mime-type type="application/x-lzop">
+     <comment>LZO archive</comment>
+     <comment xml:lang="be@latin">Archiŭ LZO</comment>
+@@ -20437,4 +20486,4 @@
+     </treemagic>
+   </mime-type>
+ 
+-</mime-info>
+\ Falta o caracter nova linha no final do arquivo
++</mime-info>
diff --git a/desktop/misc/shared-mime-info/files/shotwell-viewer-defaults.list b/desktop/misc/shared-mime-info/files/shotwell-viewer-defaults.list
new file mode 100644
index 0000000000..e354157630
--- /dev/null
+++ b/desktop/misc/shared-mime-info/files/shotwell-viewer-defaults.list
@@ -0,0 +1,52 @@
+image/jpeg=shotwell-viewer.desktop;
+image/png=shotwell-viewer.desktop;
+image/x-canon-cr2=shotwell-viewer.desktop;
+image/x-canon-crw=shotwell-viewer.desktop;
+image/x-fuji-raf=shotwell-viewer.desktop;
+image/x-adobe-dng=shotwell-viewer.desktop;
+image/x-panasonic-raw=shotwell-viewer.desktop;
+image/x-minolta-mrw=shotwell-viewer.desktop;
+image/x-nikon-nef=shotwell-viewer.desktop;
+image/x-olympus-orf=shotwell-viewer.desktop;
+image/x-pentax-pef=shotwell-viewer.desktop;
+image/x-sony-arw=shotwell-viewer.desktop;
+image/x-sony-srf=shotwell-viewer.desktop;
+image/x-sony-sr2=shotwell-viewer.desktop;
+image/x-sigma-x3f=shotwell-viewer.desktop;
+image/x-dcraw=shotwell-viewer.desktop;
+image/x-3fr=shotwell-viewer.desktop;
+image/x-arw=shotwell-viewer.desktop;
+image/x-srf=shotwell-viewer.desktop;
+image/x-sr2=shotwell-viewer.desktop;
+image/x-bay=shotwell-viewer.desktop;
+image/x-crw=shotwell-viewer.desktop;
+image/x-cr2=shotwell-viewer.desktop;
+image/x-cap=shotwell-viewer.desktop;
+image/x-iiq=shotwell-viewer.desktop;
+image/x-eip=shotwell-viewer.desktop;
+image/x-dcs=shotwell-viewer.desktop;
+image/x-dcr=shotwell-viewer.desktop;
+image/x-drf=shotwell-viewer.desktop;
+image/x-k25=shotwell-viewer.desktop;
+image/x-kdc=shotwell-viewer.desktop;
+image/x-dng=shotwell-viewer.desktop;
+image/x-erf=shotwell-viewer.desktop;
+image/x-fff=shotwell-viewer.desktop;
+image/x-mef=shotwell-viewer.desktop;
+image/x-mos=shotwell-viewer.desktop;
+image/x-mrw=shotwell-viewer.desktop;
+image/x-nef=shotwell-viewer.desktop;
+image/x-nrw=shotwell-viewer.desktop;
+image/x-orf=shotwell-viewer.desktop;
+image/x-ptx=shotwell-viewer.desktop;
+image/x-pef=shotwell-viewer.desktop;
+image/x-pxn=shotwell-viewer.desktop;
+image/x-r3d=shotwell-viewer.desktop;
+image/x-raf=shotwell-viewer.desktop;
+image/x-raw=shotwell-viewer.desktop;
+image/x-rw2=shotwell-viewer.desktop;
+image/x-raw=shotwell-viewer.desktop;
+image/x-rwl=shotwell-viewer.desktop;
+image/x-rwz=shotwell-viewer.desktop;
+image/x-x3f=shotwell-viewer.desktop;
+image/tiff=shotwell-viewer.desktop;
diff --git a/desktop/misc/shared-mime-info/files/totem-defaults.list b/desktop/misc/shared-mime-info/files/totem-defaults.list
new file mode 100644
index 0000000000..cdcf0868f7
--- /dev/null
+++ b/desktop/misc/shared-mime-info/files/totem-defaults.list
@@ -0,0 +1,118 @@
+application/mxf=totem.desktop;
+application/ogg=rhythmbox.desktop;totem.desktop;
+application/ram=totem.desktop;
+application/sdp=totem.desktop;
+application/smil=totem.desktop;
+application/smil+xml=totem.desktop;
+application/vnd.apple.mpegurl=totem.desktop;
+application/vnd.ms-wpl=totem.desktop;
+application/x-extension-m4a=totem.desktop;
+application/x-extension-mp4=totem.desktop;
+application/x-flac=totem.desktop;
+application/x-flash-video=totem.desktop;
+application/x-matroska=totem.desktop;
+application/x-netshow-channel=totem.desktop;
+application/x-ogg=rhythmbox.desktop;totem.desktop;
+application/x-quicktime-media-link=totem.desktop;
+application/x-quicktimeplayer=totem.desktop;
+application/x-shorten=totem.desktop;
+application/x-smil=totem.desktop;
+application/xspf+xml=totem.desktop;
+audio/3gpp=totem.desktop;
+audio/ac3=totem.desktop;
+audio/AMR=totem.desktop;
+audio/AMR-WB=totem.desktop;
+audio/basic=totem.desktop;
+audio/midi=totem.desktop;
+audio/mp2=totem.desktop;
+audio/mp4=totem.desktop;
+audio/mpeg=rhythmbox.desktop;totem.desktop;
+audio/mpegurl=totem.desktop;
+audio/ogg=totem.desktop;
+audio/prs.sid=totem.desktop;
+audio/x-aiff=totem.desktop;
+audio/x-ape=totem.desktop;
+audio/x-flac=rhythmbox.desktop;totem.desktop;
+audio/x-gsm=totem.desktop;
+audio/x-it=totem.desktop;
+audio/x-m4a=totem.desktop;
+audio/x-matroska=totem.desktop;
+audio/x-mod=totem.desktop;
+audio/x-mp3=rhythmbox.desktop;totem.desktop;
+audio/x-mpeg=rhythmbox.desktop;totem.desktop;
+audio/x-mpegurl=rhythmbox.desktop;totem.desktop;
+audio/x-ms-asf=totem.desktop;
+audio/x-ms-asx=totem.desktop;
+audio/x-ms-wax=totem.desktop;
+audio/x-ms-wma=totem.desktop;
+audio/x-musepack=totem.desktop;
+audio/x-pn-aiff=totem.desktop;
+audio/x-pn-au=totem.desktop;
+audio/x-pn-wav=totem.desktop;
+audio/x-pn-windows-acm=totem.desktop;
+audio/x-s3m=totem.desktop;
+audio/x-sbc=totem.desktop;
+audio/x-scpls=rhythmbox.desktop;totem.desktop;
+audio/x-speex=totem.desktop;
+audio/x-stm=totem.desktop;
+audio/x-tta=totem.desktop;
+audio/x-wav=totem.desktop;
+audio/x-wavpack=totem.desktop;
+audio/x-vorbis=totem.desktop;
+audio/x-vorbis+ogg=rhythmbox.desktop;totem.desktop;
+audio/x-xm=totem.desktop;
+image/x-pict=totem.desktop;
+misc/ultravox=totem.desktop;
+text/google-video-pointer=totem.desktop;
+text/x-google-video-pointer=totem.desktop;
+video/3gp=totem.desktop;
+video/3gpp=totem.desktop;
+video/dv=totem.desktop;
+video/divx=totem.desktop;
+video/fli=totem.desktop;
+video/flv=totem.desktop;
+video/mp2t=totem.desktop;
+video/mp4=totem.desktop;
+video/mp4v-es=totem.desktop;
+video/mpeg=totem.desktop;
+video/msvideo=totem.desktop;
+video/ogg=totem.desktop;
+video/quicktime=totem.desktop;
+video/vivo=totem.desktop;
+video/vnd.divx=totem.desktop;
+video/vnd.mpegurl=totem.desktop;
+video/vnd.vivo=totem.desktop;
+video/webm=totem.desktop;
+video/x-anim=totem.desktop;
+video/x-avi=totem.desktop;
+video/x-flc=totem.desktop;
+video/x-fli=totem.desktop;
+video/x-flic=totem.desktop;
+video/x-flv=totem.desktop;
+video/x-m4v=totem.desktop;
+video/x-matroska=totem.desktop;
+video/x-mpeg=totem.desktop;
+video/x-mpeg2=totem.desktop;
+video/x-ms-asf=totem.desktop;
+video/x-ms-asx=totem.desktop;
+video/x-msvideo=totem.desktop;
+video/x-ms-wm=totem.desktop;
+video/x-ms-wmv=totem.desktop;
+video/x-ms-wmx=totem.desktop;
+video/x-ms-wvx=totem.desktop;
+video/x-nsv=totem.desktop;
+video/x-ogm+ogg=totem.desktop;
+video/x-theora+ogg=totem.desktop;
+video/x-totem-stream=totem.desktop;
+x-content/video-dvd=totem.desktop;
+x-content/video-vcd=totem.desktop;
+x-content/video-svcd=totem.desktop;
+x-scheme-handler/pnm=totem.desktop;
+x-scheme-handler/mms=totem.desktop;
+x-scheme-handler/net=totem.desktop;
+x-scheme-handler/rtp=totem.desktop;
+x-scheme-handler/rtsp=totem.desktop;
+x-scheme-handler/mmsh=totem.desktop;
+x-scheme-handler/uvox=totem.desktop;
+x-scheme-handler/icy=totem.desktop;
+x-scheme-handler/icyx=totem.desktop;
diff --git a/desktop/misc/shared-mime-info/files/update-mime-database.sh b/desktop/misc/shared-mime-info/files/update-mime-database.sh
new file mode 100644
index 0000000000..20248c572a
--- /dev/null
+++ b/desktop/misc/shared-mime-info/files/update-mime-database.sh
@@ -0,0 +1,4 @@
+if [ -x /usr/bin/update-mime-database ]; then
+    MIME_DIR=${XDG_DATA_HOME-$HOME/.local/share}/mime
+    [ -d "$MIME_DIR" ] && /usr/bin/update-mime-database $MIME_DIR
+fi
diff --git a/desktop/misc/shared-mime-info/pspec.xml b/desktop/misc/shared-mime-info/pspec.xml
new file mode 100644
index 0000000000..cbe581aceb
--- /dev/null
+++ b/desktop/misc/shared-mime-info/pspec.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>shared-mime-info</Name>
+        <Homepage>http://freedesktop.org/wiki/Software/shared-mime-info</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>GPLv2</License>
+        <IsA>app:console</IsA>
+        <IsA>data</IsA>
+        <Summary>The shared MIME info database</Summary>
+        <Description>shared-mime-info is a package containing a large number of common MIME types, created by converting the existing KDE and GNOME databases to the new format and merging them together, and software for updating the database based on the share-mime-info specification.</Description>
+        <Archive sha1sum="f7a3881acca3df1d9757d670e99d2d56ac9f7bca" type="tarxz">http://freedesktop.org/~hadess/shared-mime-info-1.4.tar.xz</Archive>
+        <BuildDependencies>
+            <Dependency>libxml2-devel</Dependency>
+            <Dependency>glib2-devel</Dependency>
+            <Dependency>intltool</Dependency>            
+        </BuildDependencies> 
+        <Patches>
+            <Patch level="1">shared-mime-info-xz.patch</Patch>
+        </Patches>
+    </Source>
+
+    <Package>
+        <Name>shared-mime-info</Name>
+        <RuntimeDependencies>
+            <Dependency>libxml2</Dependency>
+            <Dependency>glib2</Dependency>         
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="data">/etc/X11/Xsession.d</Path>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="data">/usr/share/applications</Path>
+            <Path fileType="data">/usr/share/mime</Path>
+            <Path fileType="data">/usr/share/pkgconfig</Path>
+            <Path fileType="localedata">/usr/share/locale/</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+            <Path fileType="man">/usr/share/man</Path>
+        </Files>
+        <AdditionalFiles>
+            <AdditionalFile owner="root" permission="0644" target="/etc/X11/Xsession.d/30-update-mime-database.sh">update-mime-database.sh</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/defaults.list">defaults.list</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/mimeapps.list">mimeapps.list</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/file-roller-defaults.list">file-roller-defaults.list</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/shotwell-viewer-defaults.list">shotwell-viewer-defaults.list</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/applications/totem-defaults.list">totem-defaults.list</AdditionalFile>
+            <AdditionalFile owner="root" permission="0644" target="/usr/share/mime/packages/mimetypefixes.xml">mimetypefixes.xml</AdditionalFile>
+        </AdditionalFiles>
+        <Provides>
+            <COMAR script="pakhandler.py">System.PackageHandler</COMAR>
+            <COMAR script='package.py'>System.Package</COMAR>
+        </Provides>
+    </Package>
+
+    <History>
+        <Update release="6">
+            <Date>2015-02-16</Date>
+            <Version>1.4</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Hakan Yıldız</Name>
+            <Email>hknyldz93@gmail.com</Email>
+        </Update>
+        <Update release="5">
+            <Date>2014-11-07</Date>
+            <Version>1.3</Version>
+            <Comment>Fix ISO images appearing as .txt files in Dolphin</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
+        <Update release="4">
+            <Date>2014-05-24</Date>
+            <Version>1.3</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
+        <Update release="3">
+            <Date>2013-09-05</Date>
+            <Version>1.1</Version>
+            <Comment>Add missing method to pakhandler.py</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2013-07-11</Date>
+            <Version>1.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Yusuf Aydemir</Name>
+            <Email>yusuf.aydemir@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2012-10-13</Date>
+            <Version>1.0</Version>
+            <Comment>First release</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
diff --git a/desktop/misc/shared-mime-info/translations.xml b/desktop/misc/shared-mime-info/translations.xml
new file mode 100644
index 0000000000..1bf4bf7f22
--- /dev/null
+++ b/desktop/misc/shared-mime-info/translations.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?>
+<PISI>
+    <Source>
+        <Name>shared-mime-info</Name>
+        <Summary xml:lang="tr">Paylaşımlı MIME veritabanı tanımlamaları</Summary>
+        <Description xml:lang="tr">Bu pakette büyük miktarda dosya türü bilgisi bulunur. Bu bilgiler mevcut KDE ve GNOME veritabanlarının yeni biçime dönüştürülerek birleştirilmesinden oluşmuştur. Ayrıca, pakette bu veritabanını güncelleyen bir uygulama da bulunmaktadır.</Description>
+        <Description xml:lang="fr">shared-mim-info est un paquet contenant un grand nombre de types MIME communs, créés en fusionnant les bases de données KDE et GNOME existantes et en les convertissant au nouveau format, ainsi qu'un logiciel pour mettre à jour cette base en fonction des spécifications de share-mime-info.</Description>
+    </Source>
+</PISI>
diff --git a/desktop/toolkit/qt5/qt5-x11extras/pspec.xml b/desktop/toolkit/qt5/qt5-x11extras/pspec.xml
index 7dbf3a143d..447aa1de82 100644
--- a/desktop/toolkit/qt5/qt5-x11extras/pspec.xml
+++ b/desktop/toolkit/qt5/qt5-x11extras/pspec.xml
@@ -37,6 +37,7 @@
             <Path fileType="headers">/usr/include/qt5/</Path>
         </Files>
         <RuntimeDependencies>
+            <Dependency>qt5-x11extras</Dependency>
             <Dependency>qt5-base-devel</Dependency>
         </RuntimeDependencies>
     </Package>
diff --git a/multimedia/misc/openexr/actions.py b/multimedia/misc/openexr/actions.py
index 80932f975f..f681132891 100644
--- a/multimedia/misc/openexr/actions.py
+++ b/multimedia/misc/openexr/actions.py
@@ -15,6 +15,8 @@ def setup():
     shelltools.system("./bootstrap")
     autotools.configure("--enable-shared \
                          --disable-static")
+    
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
     autotools.make()
diff --git a/multimedia/misc/openexr/pspec.xml b/multimedia/misc/openexr/pspec.xml
index c6fbfad9cb..abece6bc53 100644
--- a/multimedia/misc/openexr/pspec.xml
+++ b/multimedia/misc/openexr/pspec.xml
@@ -16,6 +16,7 @@
         <Archive sha1sum="4a3db5ea527856145844556e0ee349f45ed4cbc7" type="targz">http://download.savannah.nongnu.org/releases/openexr/openexr-2.1.0.tar.gz</Archive>
         <BuildDependencies>
             <Dependency versionFrom="2.0.1">ilmbase-devel</Dependency>
+	    <Dependency>zlib-devel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -23,6 +24,7 @@
         <Name>openexr</Name>
         <RuntimeDependencies>
             <Dependency versionFrom="2.0.1">ilmbase</Dependency>
+	    <Dependency>libgcc</Dependency>
             <Dependency>openexr-libs</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -35,6 +37,8 @@
         <Summary>OpenEXR runtime libraries</Summary>
         <RuntimeDependencies>
             <Dependency>ilmbase</Dependency>
+	    <Dependency>zlib</Dependency>
+	    <Dependency>libgcc</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib/lib*</Path>
diff --git a/programming/language/python/python-Pygments/actions.py b/programming/language/python/python-Pygments/actions.py
new file mode 100644
index 0000000000..d41d4bd824
--- /dev/null
+++ b/programming/language/python/python-Pygments/actions.py
@@ -0,0 +1,22 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+#
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/licenses/gpl.txt
+
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import pythonmodules
+from pisi.actionsapi import get
+
+WorkDir="%s-%s" % (get.srcNAME().split("-")[1], get.srcVERSION())
+
+def build():
+    pythonmodules.compile()
+
+def install():
+    pythonmodules.install()
+
+    pisitools.dohtml("docs/build/*")
+    pisitools.insinto("/usr/share/doc/%s/src/" % get.srcNAME(),"docs/src/*")
+    pisitools.doman("docs/pygmentize.1")
+
diff --git a/programming/language/python/python-Pygments/pspec.xml b/programming/language/python/python-Pygments/pspec.xml
new file mode 100644
index 0000000000..04a03ee80e
--- /dev/null
+++ b/programming/language/python/python-Pygments/pspec.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>python-Pygments</Name>
+        <Homepage>http://pygments.org/</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>BSD</License>
+        <IsA>library</IsA>
+        <Summary>A syntax highlighting package written in Python</Summary>
+        <Description>python-Pygments is a generic syntax highlighter for general use in all kinds of software such as forum systems, wikis or other applications that need to prettify source code.</Description>
+        <Archive sha1sum="53d831b83b1e4d4f16fec604057e70519f9f02fb" type="targz">https://pypi.python.org/packages/source/P/Pygments/Pygments-1.6.tar.gz</Archive>
+    </Source>
+
+    <Package>
+        <Name>python-Pygments</Name>
+        <RuntimeDependencies>
+            <Dependency>python-setuptools</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="executable">/usr/bin</Path>
+            <Path fileType="library">/usr/lib/python*</Path>
+            <Path fileType="man">/usr/share/man</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>python-Pygments-docs</Name>
+        <Summary>Documentation files for python-Pygments</Summary>
+        <Files>
+            <Path fileType="doc">/usr/share/doc/python-Pygments</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="2">
+            <Date>2013-12-07</Date>
+            <Version>1.6</Version>
+            <Comment>Version bump</Comment>
+            <Name>Burak Fazıl Ertürk</Name>
+            <Email>burakerturk@pisilinux.org</Email>
+        </Update>        
+        <Update release="1">
+            <Date>2012-11-16</Date>
+            <Version>1.5</Version>
+            <Comment>First release</Comment>
+            <Name>Erdinç Gültekin</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
diff --git a/programming/language/python/python-Pygments/translations.xml b/programming/language/python/python-Pygments/translations.xml
new file mode 100644
index 0000000000..edaadf4187
--- /dev/null
+++ b/programming/language/python/python-Pygments/translations.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<PISI>
+    <Source>
+        <Name>python-Pygments</Name>
+        <Summary xml:lang="tr">Python dilinde yazılmış bir sözdizimi belirtme aracı</Summary>
+        <Description xml:lang="tr">python-Pygments, kaynak kodunu güzelleştirmek ihtiyacı duyulan forum sistemleri, wikiler ve diğer uygulamalar gibi her çeşit yazılımda kullanılmak için yazılmış olan genel bir sözdizimi belirtme aracıdır.</Description>
+    </Source>
+
+    <Package>
+        <Name>python-Pygments-docs</Name>
+        <Summary xml:lang="tr">python-Pygments için belgelendirme dosyaları</Summary>
+    </Package>
+</PISI>
diff --git a/programming/language/python/python-six/actions.py b/programming/language/python/python-six/actions.py
new file mode 100644
index 0000000000..a0c38b6fc3
--- /dev/null
+++ b/programming/language/python/python-six/actions.py
@@ -0,0 +1,33 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/copyleft/gpl.txt
+
+from pisi.actionsapi import pythonmodules
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import get
+
+WorkDir="six-%s" % get.srcVERSION()
+
+def setup():
+    shelltools.cd("..")
+    shelltools.makedirs("build_python3")
+    shelltools.copytree("./%s" % WorkDir,  "build_python3")
+    shelltools.cd(WorkDir)
+
+def build():
+    pythonmodules.compile()
+
+    shelltools.cd("../build_python3/%s" % WorkDir)
+    pythonmodules.compile(pyVer="3.4")
+
+def install():
+    pythonmodules.install()
+
+    shelltools.cd("../build_python3/%s" % WorkDir)
+    pythonmodules.install(pyVer="3.4")
+
+    pisitools.removeDir("/usr/lib/*/site-packages/six-1.9.0*egg-info*")
+    pisitools.remove("/usr/lib/*/site-packages/*egg-info*")
\ No newline at end of file
diff --git a/programming/language/python/python-six/pspec.xml b/programming/language/python/python-six/pspec.xml
new file mode 100644
index 0000000000..a36bf4f420
--- /dev/null
+++ b/programming/language/python/python-six/pspec.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>python-six</Name>
+        <Homepage>http://pypi.python.org/pypi/six/</Homepage>
+        <Packager>
+            <Name>Alihan Öztürk</Name>
+            <Email>alihan@pisilinux.org</Email>
+        </Packager>
+        <License>MIT</License>
+        <IsA>app:console</IsA>
+        <Summary>Python 2 and 3 compatibility utilities.</Summary>
+        <Description>python-six provides simple utilities for wrapping over differences between Python 2 and Python 3.</Description>
+        <BuildDependencies>
+            <Dependency>python3</Dependency>
+        </BuildDependencies>
+        <Archive sha1sum="d168e6d01f0900875c6ecebc97da72d0fda31129" type="targz">http://pypi.python.org/packages/source/s/six/six-1.9.0.tar.gz</Archive>
+    </Source>
+    <Package>
+        <Name>python-six</Name>
+        <Files>
+            <Path fileType="library">/usr/lib/python2*</Path>
+            <Path fileType="doc">/usr/share/doc</Path>
+        </Files>
+    </Package>
+
+    <Package>
+        <Name>python3-six</Name>
+        <Files>
+            <Path fileType="library">/usr/lib/python3*</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="2">
+            <Date>2015-07-24</Date>
+            <Version>1.9.0</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Ertuğrul Erata</Name>
+            <Email>ertugrulerata@gmail.com</Email>
+        </Update>
+        <Update release="1">
+            <Date>2014-05-31</Date>
+            <Version>1.6.1</Version>
+            <Comment>First release</Comment>
+            <Name>Alihan Öztürk</Name>
+            <Email>alihan@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
diff --git a/programming/language/python/python-six/translations.xml b/programming/language/python/python-six/translations.xml
new file mode 100644
index 0000000000..990f909a53
--- /dev/null
+++ b/programming/language/python/python-six/translations.xml
@@ -0,0 +1,7 @@
+<PISI>
+    <Source>
+        <Name>python-six</Name>
+        <Summary xml:lang="tr">Python2 ve python3 uyumluluk programı.</Summary>
+        <Description xml:lang="tr">python-six, python2 ile python3 arasındaki farklılıkların aşılmasına yardımcı olan basit araçlar sağlar.</Description>
+    </Source>
+</PISI>
diff --git a/programming/language/python3/actions.py b/programming/language/python3/actions.py
new file mode 100644
index 0000000000..62a177f369
--- /dev/null
+++ b/programming/language/python3/actions.py
@@ -0,0 +1,46 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Licensed under the GNU General Public License, version 3.
+# See the file http://www.gnu.org/copyleft/gpl.txt
+
+from pisi.actionsapi import get
+from pisi.actionsapi import autotools
+from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+
+def setup():
+    pisitools.flags.add("-fwrapv")
+
+    pisitools.dosed("Lib/cgi.py","^#.* /usr/local/bin/python","#!/usr/bin/python")
+
+    shelltools.unlinkDir("Modules/expat")
+    shelltools.unlinkDir("Modules/zlib")
+    shelltools.unlinkDir("Modules/_ctypes/darwin")
+    shelltools.unlinkDir("Modules/_ctypes/libffi")
+    shelltools.unlinkDir("Modules/_ctypes/libffi_arm_wince")
+    shelltools.unlinkDir("Modules/_ctypes/libffi_msvc")
+    shelltools.unlinkDir("Modules/_ctypes/libffi_osx")
+
+    autotools.rawConfigure("\
+                            --prefix=/usr \
+                            --enable-ipv6 \
+                            --enable-loadable-sqlite-extensions \
+                            --enable-shared \
+                            --with-computed-gotos \
+                            --with-dbmliborder=gdbm:ndbm \
+                            --with-fpectl \
+                            --with-system-expat \
+                            --with-system-ffi \
+                            --with-system-libmpdec \
+                            --with-threads \
+                            --with-valgrind \
+                            --without-ensurepip \
+                           ")
+
+def build():
+    autotools.make()
+
+def install():
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    pisitools.remove("/usr/bin/2to3")
+    pisitools.dodoc("LICENSE", "README")
diff --git a/programming/language/python3/files/Python-3.1.1-rpath.patch b/programming/language/python3/files/Python-3.1.1-rpath.patch
new file mode 100644
index 0000000000..1493af2957
--- /dev/null
+++ b/programming/language/python3/files/Python-3.1.1-rpath.patch
@@ -0,0 +1,20 @@
+diff -up Python-3.1.1/Lib/distutils/unixccompiler.py.rpath Python-3.1.1/Lib/distutils/unixccompiler.py
+--- Python-3.1.1/Lib/distutils/unixccompiler.py.rpath	2009-09-04 17:29:34.000000000 -0400
++++ Python-3.1.1/Lib/distutils/unixccompiler.py	2009-09-04 17:49:54.000000000 -0400
+@@ -141,6 +141,16 @@ class UnixCCompiler(CCompiler):
+     if sys.platform == "cygwin":
+         exe_extension = ".exe"
+ 
++    def _fix_lib_args(self, libraries, library_dirs, runtime_library_dirs):
++        """Remove standard library path from rpath"""
++        libraries, library_dirs, runtime_library_dirs = super(
++            self.__class__, self)._fix_lib_args(libraries, library_dirs,
++            runtime_library_dirs)
++        libdir = sysconfig.get_config_var('LIBDIR')
++        if runtime_library_dirs and (libdir in runtime_library_dirs):
++            runtime_library_dirs.remove(libdir)
++        return libraries, library_dirs, runtime_library_dirs
++
+     def preprocess(self, source, output_file=None, macros=None,
+                    include_dirs=None, extra_preargs=None, extra_postargs=None):
+         fixed_args = self._fix_compile_args(None, macros, include_dirs)
diff --git a/programming/language/python3/pspec.xml b/programming/language/python3/pspec.xml
new file mode 100644
index 0000000000..f74cce42aa
--- /dev/null
+++ b/programming/language/python3/pspec.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" ?>
+<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<PISI>
+    <Source>
+        <Name>python3</Name>
+        <Homepage>http://www.python.org/</Homepage>
+        <Packager>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Packager>
+        <License>custom</License>
+        <PartOf>programming.language</PartOf>
+        <Summary>Next generation of the python high-level scripting language</Summary>
+        <Description>Next generation of the python high-level scripting language</Description>
+        <BuildDependencies>
+            <Dependency>valgrind</Dependency>
+            <Dependency>tcltk-devel</Dependency>
+            <Dependency>xz-devel</Dependency>
+            <Dependency>gdbm-devel</Dependency>
+            <Dependency>zlib-devel</Dependency>
+            <Dependency>bzip2</Dependency>
+            <Dependency>expat-devel</Dependency>
+            <Dependency>libffi-devel</Dependency>
+            <Dependency>sqlite-devel</Dependency>
+            <Dependency>ncurses-devel</Dependency>
+            <Dependency>openssl-devel</Dependency>
+            <Dependency>readline-devel</Dependency>
+        </BuildDependencies>
+        <Archive sha1sum="143e098efe7ee7bec8a4904ec4b322f28a067a03" type="tarxz">http://www.python.org/ftp/python/3.4.1/Python-3.4.1.tar.xz</Archive>
+        <Patches>
+            <Patch level="1">Python-3.1.1-rpath.patch</Patch>
+        </Patches>
+    </Source>
+
+    <Package>
+        <Name>python3</Name>
+        <RuntimeDependencies>
+            <Dependency>tcl</Dependency>
+            <Dependency>tcltk</Dependency>
+            <Dependency>xz</Dependency>
+            <Dependency>gdbm</Dependency>
+            <Dependency>zlib</Dependency>
+            <Dependency>bzip2</Dependency>
+            <Dependency>expat</Dependency>
+            <Dependency>libffi</Dependency>
+            <Dependency>sqlite</Dependency>
+            <Dependency>ncurses</Dependency>
+            <Dependency>openssl</Dependency>
+            <Dependency>readline</Dependency>
+        </RuntimeDependencies>
+        <Files>
+            <Path fileType="executable" permanent="0">/usr/bin/*</Path>
+            <Path fileType="header" permanent="0">/usr/include/python3.4m/*</Path>
+            <Path fileType="library" permanent="0">/usr/lib/pkgconfig/*</Path>
+            <Path fileType="library" permanent="0">/usr/lib/python3.4/*</Path>
+            <Path fileType="library" permanent="0">/usr/lib/*</Path>
+            <Path fileType="man" permanent="0">/usr/share/man/man1/*</Path>
+            <Path fileType="doc" permanent="0">/usr/share/doc</Path>
+        </Files>
+    </Package>
+
+    <History>
+        <Update release="4">
+            <Date>2014-05-26</Date>
+            <Version>3.4.1</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin@pisilinux.org</Email>
+        </Update>
+        <Update release="3">
+            <Date>2013-09-09</Date>
+            <Version>3.3.0</Version>
+            <Comment>V.Bump</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
+        <Update release="2">
+            <Date>2013-08-17</Date>
+            <Version>3.3.0</Version>
+            <Comment>Dep Fixed</Comment>
+            <Name>PisiLinux Community</Name>
+            <Email>admins@pisilinux.org</Email>
+        </Update>
+        <Update release="1">
+            <Date>2012-11-11</Date>
+            <Version>3.3.0</Version>
+            <Comment>First release</Comment>
+            <Name>Marcin Bojara</Name>
+            <Email>marcin@pisilinux.org</Email>
+        </Update>
+    </History>
+</PISI>
diff --git a/science/misc/ilmbase/actions.py b/science/misc/ilmbase/actions.py
index f2f348b5bd..3771bd7830 100644
--- a/science/misc/ilmbase/actions.py
+++ b/science/misc/ilmbase/actions.py
@@ -12,6 +12,8 @@ from pisi.actionsapi import get
 def setup():
     shelltools.system("./bootstrap")
     autotools.configure("--disable-static")
+    
+    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
     autotools.make()
diff --git a/science/misc/ilmbase/pspec.xml b/science/misc/ilmbase/pspec.xml
index cda3640dde..7037c864ed 100644
--- a/science/misc/ilmbase/pspec.xml
+++ b/science/misc/ilmbase/pspec.xml
@@ -22,6 +22,9 @@
 
     <Package>
         <Name>ilmbase</Name>
+        <RuntimeDependencies>
+            <Dependency>libgcc</Dependency>
+        </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib</Path>
             <Path fileType="doc">/usr/share/doc</Path>
@@ -33,8 +36,8 @@
         <Summary>Development files for ilmbase</Summary>
         <RuntimeDependencies>
             <Dependency release="current">ilmbase</Dependency>
-            <Dependency>mesa-glu-devel</Dependency>
-            <Dependency>mesa-devel</Dependency>
+            <!--Dependency>mesa-glu-devel</Dependency>
+            <Dependency>mesa-devel</Dependency-->
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>