diff --git a/network/connection/NetworkManager/actions.py b/network/connection/NetworkManager/actions.py
index ca5b3d1766..7e4f6572d9 100644
--- a/network/connection/NetworkManager/actions.py
+++ b/network/connection/NetworkManager/actions.py
@@ -11,29 +11,25 @@ from pisi.actionsapi import shelltools
 
 
 def setup():
-    autotools.autoreconf("-fiv")
+    # /var/run => /run
+    for f in ["configure.ac", "src/Makefile.am", "src/Makefile.in"]:
+        pisitools.dosed(f, "\$\(?localstatedir\)?(\/run\/(\$PACKAGE|NetworkManager))", "\\1")
+    pisitools.dosed("configure.ac", "\/var(\/run\/ConsoleKit)", "\\1")
+    pisitools.dosed("configure.ac", "^initscript", deleteLine=True)
+    autotools.autoreconf("-fi")
     shelltools.system("intltoolize --force --copy --automake")
 
     autotools.configure("--disable-static \
                          --disable-silent-rules \
                          --disable-wimax \
-                         --disable-ifcfg-rh \
-                         --disable-ifcfg-suse \
-                         --disable-ifnet \
-                         --disable-ifupdown \
                          --disable-lto \
+                         --disable-config-plugin-ibft \
+                         --disable-ifnet \
                          --disable-more-warnings \
-                         --enable-introspection \
-                         --enable-wifi \
                          --enable-modify-system \
                          --enable-ppp=yes \
-                         --enable-bluez5-dun \
+                         --enable-bluez5=yes \
                          --enable-concheck \
-                         --enable-config-plugin-ibft \
-                         --enable-vala=yes \
-                         --enable-json-validation \
-                         --enable-polkit \
-                         --enable-polkit-agent \
                          --without-netconfig \
                          --with-modem-manager-1 \
                          --with-libsoup=yes \
@@ -41,31 +37,30 @@ def setup():
                          --with-suspend-resume=upower \
                          --with-system-ca-path=/etc/ssl/certs \
                          --with-crypto=nss \
-                         --with-config-dhcp-default=/usr/bin/dhcpcd \
+                         --with-dhcpcd=/sbin/dhcpcd \
                          --with-pppd=/usr/sbin/pppd \
+                         --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \
                          --with-dbus-sys-dir=/etc/dbus-1/system.d \
+                         --with-dhclient=/usr/sbin/dhclient \
                          --with-kernel-firmware-dir=/lib/firmware \
                          --with-udev-dir=/lib/udev \
                          --with-resolvconf=/etc/resolv.default.conf \
                          --with-iptables=/usr/sbin/iptables \
+                         --with-dnsmasq=/usr/sbin/dnsmasq \
                          --with-systemdsystemunitdir=no \
                          --with-nmtui \
-                         --with-pppd-plugin-dir=/usr/lib/pppd/2.4.7 \
-                         --without-valgrind \
                          --localstatedir=/var \
                          --sysconfdir=/etc \
                          --libexecdir=/usr/lib/NetworkManager \
-                         --with-dhcpcd=/usr/bin/dhcpcd \
-                         --without-dhclient \
-                        " )
+                        ")
 
-    pisitools.dosed("libtool", "-shared", "-Wl, --as-needed -shared")
+    pisitools.dosed("libtool", " -shared ", " -Wl,--as-needed -shared ")
 
 def build():
     autotools.make()
 
 #def check():
-    #autotools.make("check")
+    #autotools.make("-k check")
 
 def install():
     autotools.rawInstall("DESTDIR=%s" % get.installDIR())
diff --git a/network/connection/NetworkManager/comar/service.py b/network/connection/NetworkManager/comar/service.py
index 52f2d23b94..1b91c789c1 100644
--- a/network/connection/NetworkManager/comar/service.py
+++ b/network/connection/NetworkManager/comar/service.py
@@ -41,4 +41,4 @@ def ready():
         start()
 
 def status():
-    return isServiceRunning(pidfile=PIDFILE)
\ No newline at end of file
+    return isServiceRunning(pidfile=PIDFILE)
diff --git a/network/connection/NetworkManager/files/NetworkManager.conf b/network/connection/NetworkManager/files/NetworkManager.conf
index 002534833b..ca4b5883f5 100644
--- a/network/connection/NetworkManager/files/NetworkManager.conf
+++ b/network/connection/NetworkManager/files/NetworkManager.conf
@@ -1,4 +1,5 @@
 [main]
 plugins=keyfile
 dhcp=internal
-dns=default
\ No newline at end of file
+dns=default
+
diff --git a/network/connection/NetworkManager/files/gentoo/01-org.freedesktop.NetworkManager.settings.modify.system.pkla b/network/connection/NetworkManager/files/gentoo/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
index 24f8d0bd17..9bc8e88a3b 100644
--- a/network/connection/NetworkManager/files/gentoo/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
+++ b/network/connection/NetworkManager/files/gentoo/01-org.freedesktop.NetworkManager.settings.modify.system.pkla
@@ -3,4 +3,4 @@ Identity=unix-group:removable
 Action=org.freedesktop.NetworkManager.settings.*
 ResultAny=no
 ResultInactive=no
-ResultActive=yes
\ No newline at end of file
+ResultActive=yes
diff --git a/network/connection/NetworkManager/pspec.xml b/network/connection/NetworkManager/pspec.xml
index dae05ec921..6530ed27b2 100644
--- a/network/connection/NetworkManager/pspec.xml
+++ b/network/connection/NetworkManager/pspec.xml
@@ -12,19 +12,14 @@
         <IsA>app:console</IsA>
         <Summary>Network connection manager powered by D-Bus and UDEV</Summary>
         <Description>NetworkManager attempts to keep an active network connection available at all times.</Description>
-        <Archive sha1sum="fee830aee4b8d719046add91efa13ac08648b017" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.6/NetworkManager-1.6.2.tar.xz</Archive>
+        <Archive sha1sum="1c199fdfb9fff9e7f540d51952699ce815a12369" type="tarxz">https://download.gnome.org/sources/NetworkManager/1.0/NetworkManager-1.0.10.tar.xz</Archive>
         <AdditionalFiles>
-<!--             <AdditionalFile target="po/tr.po">tr.po</AdditionalFile> -->
+            <AdditionalFile target="po/tr.po">tr.po</AdditionalFile>
         </AdditionalFiles>
         <BuildDependencies>
             <Dependency>intltool</Dependency>
-            <Dependency>dhcpcd</Dependency>
-            <Dependency>iproute2</Dependency>
             <!--Dependency>dhclient</Dependency-->
             <Dependency>ppp-devel</Dependency>
-            <Dependency>vala-devel</Dependency>
-            <Dependency>jansson-devel</Dependency>
-            <Dependency>gettext-devel</Dependency>
             <Dependency>nss-devel</Dependency>
             <Dependency>newt-devel</Dependency>
             <Dependency>nspr-devel</Dependency>
@@ -43,18 +38,12 @@
             <Dependency>readline-devel</Dependency>
             <Dependency>libgudev-devel</Dependency>
             <Dependency>libutil-linux-devel</Dependency>
-            <Dependency versionFrom="1.0.2">ConsoleKit-devel</Dependency>
-            <Dependency>gtk-doc</Dependency>
-            <Dependency>gobject-introspection-devel</Dependency>
-            <Dependency>python-pygobject3-devel</Dependency>
-            <Dependency>upower-devel</Dependency>
-            <Dependency>docbook-xsl</Dependency>
-            <Dependency>libxslt-devel</Dependency>
+            <Dependency versionFrom="0.9.2">ConsoleKit-devel</Dependency>
         </BuildDependencies>
         <Patches>
-             <!--<Patch>0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch</Patch>-->
-             <!--Patch>0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch</Patch-->
-<!--             <Patch>disable_set_hostname.patch</Patch> -->
+	  <!--<Patch>0001-dns-Fix-falling-back-in-the-resolv.conf-methods.patch</Patch>-->
+            <Patch>0001-core-fix-failure-to-configure-routes-due-to-wrong-de.patch</Patch>
+            <Patch>disable_set_hostname.patch</Patch>
         </Patches>
     </Source>
 
@@ -62,7 +51,6 @@
         <Name>NetworkManager</Name>
         <RuntimeDependencies>
             <Dependency>dbus</Dependency>
-            <Dependency>dhcpcd</Dependency>
             <Dependency>nspr</Dependency>
             <Dependency>glib2</Dependency>
             <Dependency>polkit</Dependency>
@@ -81,9 +69,8 @@
             <Dependency>libmm-glib</Dependency>
             <Dependency>ModemManager</Dependency>
             <Dependency>wpa_supplicant</Dependency>
-            <Dependency>jansson</Dependency>
             <Dependency>libndp</Dependency>
-            <Dependency versionFrom="1.0.2">ConsoleKit</Dependency>
+            <Dependency versionFrom="0.9.2">ConsoleKit</Dependency>
             <Dependency>mobile-broadband-provider-info</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -105,7 +92,6 @@
             <Path fileType="data">/etc/NetworkManager/system-connections</Path>
             <Path fileType="config">/usr/lib/tmpfiles.d/NetworkManager.conf</Path>
             <Path fileType="config">/etc/polkit-1/localauthority/10-vendor.d</Path>
-            <Path fileType="data">/var/run</Path>
         </Files>
         <AdditionalFiles>
             <AdditionalFile owner="root" permission="0644" target="/etc/conf.d/NetworkManager">NetworkManager.confd</AdditionalFile>
@@ -136,25 +122,15 @@
     </Package>
 
     <History>
-        <Update release="6">
-            <Date>2017-02-24</Date>
-            <Version>1.6.2</Version>
-            <Comment>Version Bump.</Comment>
+        <Update release="5">
+            <Date>2017-03-15</Date>
+            <Version>1.0.10</Version>
+            <Comment>Revert version</Comment>
             <Requires>
                 <Action package="NetworkManager">systemRestart</Action>
             </Requires>
             <Name>Ayhan Yalçınsoy</Name>
-            <Email>ayhanyalcinsoy@pisilinux.org</Email>
-        </Update>
-        <Update release="5">
-            <Date>2017-02-21</Date>
-            <Version>1.4.4</Version>
-            <Comment>Version Bump.</Comment>
-            <Requires>
-                <Action package="NetworkManager">systemRestart</Action>
-            </Requires>
-            <Name>Ertuğrul Erata</Name>
-            <Email>ertugrulerata@gmail.com</Email>
+            <Email>ayhanyalcinsoy@pisilnux.org</Email>
         </Update>
         <Update release="4">
             <Date>2016-12-15</Date>
diff --git a/x11/util/alternatives/pspec.xml b/x11/util/alternatives/pspec.xml
index c37e6b7e01..da18931a11 100644
--- a/x11/util/alternatives/pspec.xml
+++ b/x11/util/alternatives/pspec.xml
@@ -13,7 +13,7 @@
         <IsA>app:console</IsA>
         <Summary>Alternative management system</Summary>
         <Description>alternatives creates, removes, maintains and displays information about the symbolic links comprising the alternatives system. Alternatives system determines the defaults when several programs fulfilling the same or similar functions to be installed on a single system at the same time.</Description>
-        <Archive sha1sum="f4ad69599202834acb331e96df27d303ee383e67" type="tarxz">https://git.fedorahosted.org/cgit/chkconfig.git/snapshot/chkconfig-1.3.63.tar.xz</Archive>
+        <Archive sha1sum="d2111640833792e96859559113c89467ea0f9a80" type="targz">https://github.com/fedora-sysv/chkconfig/archive/chkconfig-1.3.63.tar.gz</Archive>
         <BuildDependencies>
             <Dependency>popt-devel</Dependency>
             <Dependency>newt-devel</Dependency>