diff --git a/octopi/PKGBUILD b/octopi/PKGBUILD
index 3d8760a35..55c47348a 100644
--- a/octopi/PKGBUILD
+++ b/octopi/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=octopi
 pkgname=('octopi' 'octopi-notifier' 'octopi-qt5' 'octopi-notifier-qt5')
-pkgver=0.5.0.90
+pkgver=0.6.0
 pkgrel=1
 url="https://octopiproject.wordpress.com/"
 arch=('x86_64')
@@ -15,7 +15,7 @@ replaces=('oktopi')
 categories=('system') 
 screenshot=('http://octopiproject.files.wordpress.com/2014/01/octopi_in_kaos.png')
 
-gitsha=9a2bc23
+gitsha=94d4adf
 source=("$pkgname"::"git://github.com/aarnt/${pkgname}.git#commit=${gitsha}")
 md5sums=('SKIP')
 
@@ -23,7 +23,7 @@ prepare(){
     cd "${srcdir}/${pkgbase}"
 
     # patch .desktop files
-    sed -i 's/Categories=GNOME;GTK;System;/Categories=System;Tools;/g' octopi.desktop octopi-notifier.desktop
+    sed -i 's/Categories=GNOME;GTK;System;/Categories=System;Tools;/g' octopi.desktop octopi-notifier.desktop cachecleaner/octopi-cachecleaner.desktop
     sed -i 's/\/\/#define NO_GTK_STYLE/#define NO_GTK_STYLE/g' src/main.cpp notifier/octopi-notifier/main.cpp
     sed -i 's/Icon=octopi/Icon=octopi-notifier/g' octopi-notifier.desktop
 
@@ -44,14 +44,19 @@ build() {
    qmake pacmanhelper.pro
    make
    popd
-   
+
    pushd "notifier/octopi-notifier"
    qmake octopi-notifier.pro
    make
    popd
 
    pushd "repoeditor"
-   qmake repoeditor.pro
+   qmake octopi-repoeditor.pro
+   make
+   popd
+
+   pushd "cachecleaner"
+   qmake octopi-cachecleaner.pro
    make
    popd
 
@@ -71,7 +76,12 @@ build() {
    popd
 
    pushd "repoeditor"
-   qmake-qt5 repoeditor.pro
+   qmake-qt5 octopi-repoeditor.pro
+   make
+   popd
+
+   pushd "cachecleaner"
+   qmake-qt5 octopi-cachecleaner.pro
    make
    popd
 }
@@ -87,6 +97,10 @@ package_octopi() {
    install -Dm 755 repoeditor/bin/octopi-repoeditor ${pkgdir}/usr/bin/octopi-repoeditor
    install -Dm 644 octopi.desktop ${pkgdir}/usr/share/applications/octopi.desktop
    install -Dm 644 resources/images/octopi_green.png ${pkgdir}/usr/share/icons/octopi.png
+
+   #Octopi-cachecleaner file
+   install -Dm 755 cachecleaner/bin/octopi-cachecleaner ${pkgdir}/usr/bin/octopi-cachecleaner
+   install -Dm 644 cachecleaner/octopi-cachecleaner.desktop ${pkgdir}/usr/share/applications/octopi-cachecleaner.desktop
 }
 
 package_octopi-notifier() {
@@ -121,6 +135,10 @@ package_octopi-qt5() {
    install -Dm 755 repoeditor/bin/octopi-repoeditor ${pkgdir}/usr/bin/octopi-repoeditor
    install -Dm 644 octopi.desktop ${pkgdir}/usr/share/applications/octopi.desktop
    install -Dm 644 resources/images/octopi_green.png ${pkgdir}/usr/share/icons/octopi.png
+
+   #Octopi-cachecleaner file
+   install -Dm 755 cachecleaner/bin/octopi-cachecleaner ${pkgdir}/usr/bin/octopi-cachecleaner
+   install -Dm 644 cachecleaner/octopi-cachecleaner.desktop ${pkgdir}/usr/share/applications/octopi-cachecleaner.desktop
 }
 
 package_octopi-notifier-qt5() {