diff --git a/programming/library/libaccounts-glib/actions.py b/programming/library/libaccounts-glib/actions.py
index 4bf4662426..49f0c145ac 100644
--- a/programming/library/libaccounts-glib/actions.py
+++ b/programming/library/libaccounts-glib/actions.py
@@ -11,9 +11,10 @@ from pisi.actionsapi import get
 
 
 def setup():
-    shelltools.system("PYTHON=/usr/bin/python2.7 HAVE_GCOV_FALSE='#' ./configure \
-                          --disable-static \
-                          --disable-gtk-doc")
+    shelltools.system("./autogen.sh")
+    autotools.configure("--prefix=/usr \
+                         --disable-static \
+                         --disable-gtk-doc")
 
 def build():
     autotools.make()
@@ -21,11 +22,4 @@ def build():
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
     
-    pisitools.domove("/usr/local/include/libaccounts-glib/*", "/usr/include/libaccounts-glib/")
-    pisitools.domove("/usr/local/lib/*", "/usr/lib/")
-    pisitools.domove("/usr/local/bin/*", "/usr/bin/")
-    pisitools.domove("/usr/local/share/*", "/usr/share/")
-    
-    pisitools.removeDir("/usr/local")
-    
     pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING")
diff --git a/programming/library/libaccounts-glib/pspec.xml b/programming/library/libaccounts-glib/pspec.xml
index 7fa2fe20a5..70d4d69c31 100644
--- a/programming/library/libaccounts-glib/pspec.xml
+++ b/programming/library/libaccounts-glib/pspec.xml
@@ -12,14 +12,14 @@
         <License>LGPLv2</License>
         <Summary>Accounts and SSO (Single Sign-On) framework</Summary>
         <Description>Accounts and SSO (Single Sign-On) framework for Linux and POSIX based platforms.</Description>
-        <Archive sha1sum="62b4a0b51afcb4fea88a92abae9dadb8fe72b34f" type="targz">http://heanet.dl.sourceforge.net/project/kaosx/sources/libaccounts-glib/libaccounts-glib-1.18.tar.gz</Archive>
+        <Archive sha1sum="35fdf91691682a8302ec09d3c52a0985f05d6b9b" type="tarbz2">https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.tar.bz2</Archive>
         <BuildDependencies>
-	    <Dependency>glib2-devel</Dependency>
-	    <Dependency>libxml2-devel</Dependency>
-	    <Dependency>sqlite-devel</Dependency>
- 	    <Dependency>gtk-doc</Dependency>
-	    <Dependency>docbook-xsl</Dependency>
-	    <Dependency>python-pygobject-devel</Dependency>
+            <Dependency>glib2-devel</Dependency>
+            <Dependency>libxml2-devel</Dependency>
+            <Dependency>sqlite-devel</Dependency>
+            <Dependency>gtk-doc</Dependency>
+            <Dependency>docbook-xsl</Dependency>
+            <Dependency>python-pygobject-devel</Dependency>
         </BuildDependencies>
     </Source>
 
@@ -28,8 +28,8 @@
         <IsA>library</IsA>
         <RuntimeDependencies>
             <Dependency>glib2</Dependency>
-	    <Dependency>sqlite</Dependency>
-	    <Dependency>libxml2</Dependency>
+            <Dependency>sqlite</Dependency>
+            <Dependency>libxml2</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin</Path>
@@ -37,7 +37,7 @@
             <Path fileType="conf">/usr/share/backup-framework/applications/accounts.conf</Path>
             <Path fileType="data">/usr/share/xml</Path>
             <Path fileType="data">/usr/share/libaccounts-glib/testdata</Path>
-	    <Path fileType="data">/usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.Accounts.Manager.xml</Path>
+            <Path fileType="data">/usr/share/dbus-1/interfaces/com.google.code.AccountsSSO.Accounts.Manager.xml</Path>
             <Path fileType="man">/usr/share/man/man1</Path>
         </Files>
     </Package>
@@ -48,6 +48,8 @@
         <RuntimeDependencies>
             <Dependency release="current">libaccounts-glib</Dependency>
             <Dependency>glib2-devel</Dependency>
+            <Dependency>libxml2-devel</Dependency>
+            <Dependency>sqlite-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="header">/usr/include</Path>
@@ -72,8 +74,8 @@
 
     <History>
         <Update release="1">
-            <Date>2015-10-20</Date>
-            <Version>1.18</Version>
+            <Date>2016-03-30</Date>
+            <Version>1.21</Version>
             <Comment>First release</Comment>
             <Name>Alihan Öztürk</Name>
             <Email>alihan@pisilinux.org</Email>