diff --git a/after-local.service b/after-local.service
index a9fb26a7..500c2370 100644
--- a/after-local.service
+++ b/after-local.service
@@ -15,4 +15,3 @@ Type=idle
 ExecStart=/etc/init.d/after.local
 TimeoutSec=0
 RemainAfterExit=yes
-SysVStartPriority=99
diff --git a/systemd-mini.changes b/systemd-mini.changes
index a172eb6e..37c4df85 100644
--- a/systemd-mini.changes
+++ b/systemd-mini.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Jul  1 03:43:51 UTC 2015 - crrodriguez@opensuse.org
+
+- remove SysVStartPriority= from after-local.service,
+  unsupported since v218.
+  Note that this option was only parsed and that's it. the logic
+  to give "start priority" was never implemented.
+
+-------------------------------------------------------------------
+Wed Jul  1 03:20:20 UTC 2015 - crrodriguez@opensuse.org
+
+- change the default fallback ntp servers to the opensuse 
+  pool.ntp.org vendor zone.
+- We still need to run systemd-sysctl.service after local-fs.target
+ otherwise it works only when /boot is in the root filesystem but
+ not when it is a separate partition.
+
 -------------------------------------------------------------------
 Fri Jun 26 17:14:46 CEST 2015 - sbrabec@suse.com
 
diff --git a/systemd-mini.spec b/systemd-mini.spec
index f48eef16..71fd9ad0 100644
--- a/systemd-mini.spec
+++ b/systemd-mini.spec
@@ -686,6 +686,7 @@ cflags -Wl,-O2			LDFLAGS
 cflags -Wl,--hash-size=8599	LDFLAGS
 # keep split-usr until all packages have moved their systemd rules to /usr
 %configure \
+  --with-ntp-servers="0.opensuse.pool.ntp.org 1.opensuse.pool.ntp.org 2.opensuse.pool.ntp.org 3.opensuse.pool.ntp.org" \
   --docdir=%{_docdir}/systemd \
   --with-pamlibdir=/%{_lib}/security \
   --with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
@@ -844,6 +845,13 @@ d! /run/sysctl.d
 L! /run/sysctl.d/00-kernel-%v.conf -    -    -    -   /boot/sysctl.conf-%v
 EOF
 
+mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system/systemd-sysctl.service.d
+
+cat << EOF > %{buildroot}/%{_prefix}/lib/systemd/system/systemd-sysctl.service.d/after.conf
+[Unit]
+After=local-fs.target
+EOF
+
 # ensure after.local wrapper is called
 install -m 644 %{S:11} %{buildroot}/%{_prefix}/lib/systemd/system/
 ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/
@@ -1208,6 +1216,8 @@ exit 0
 %dir %{_prefix}/lib/systemd/system/dbus.target.wants
 %dir %{_prefix}/lib/systemd/system/getty@tty1.service.d
 %{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
+%dir %{_prefix}/lib/systemd/system/systemd-sysctl.service.d
+%{_prefix}/lib/systemd/system/systemd-sysctl.service.d/after.conf
 %if ! 0%{?bootstrap}
 %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
 %endif
diff --git a/systemd.changes b/systemd.changes
index a172eb6e..37c4df85 100644
--- a/systemd.changes
+++ b/systemd.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Wed Jul  1 03:43:51 UTC 2015 - crrodriguez@opensuse.org
+
+- remove SysVStartPriority= from after-local.service,
+  unsupported since v218.
+  Note that this option was only parsed and that's it. the logic
+  to give "start priority" was never implemented.
+
+-------------------------------------------------------------------
+Wed Jul  1 03:20:20 UTC 2015 - crrodriguez@opensuse.org
+
+- change the default fallback ntp servers to the opensuse 
+  pool.ntp.org vendor zone.
+- We still need to run systemd-sysctl.service after local-fs.target
+ otherwise it works only when /boot is in the root filesystem but
+ not when it is a separate partition.
+
 -------------------------------------------------------------------
 Fri Jun 26 17:14:46 CEST 2015 - sbrabec@suse.com
 
diff --git a/systemd.spec b/systemd.spec
index 00461c77..35513b8b 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -681,6 +681,7 @@ cflags -Wl,-O2			LDFLAGS
 cflags -Wl,--hash-size=8599	LDFLAGS
 # keep split-usr until all packages have moved their systemd rules to /usr
 %configure \
+  --with-ntp-servers="0.opensuse.pool.ntp.org 1.opensuse.pool.ntp.org 2.opensuse.pool.ntp.org 3.opensuse.pool.ntp.org" \
   --docdir=%{_docdir}/systemd \
   --with-pamlibdir=/%{_lib}/security \
   --with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \
@@ -839,6 +840,13 @@ d! /run/sysctl.d
 L! /run/sysctl.d/00-kernel-%v.conf -    -    -    -   /boot/sysctl.conf-%v
 EOF
 
+mkdir -p %{buildroot}/%{_prefix}/lib/systemd/system/systemd-sysctl.service.d
+
+cat << EOF > %{buildroot}/%{_prefix}/lib/systemd/system/systemd-sysctl.service.d/after.conf
+[Unit]
+After=local-fs.target
+EOF
+
 # ensure after.local wrapper is called
 install -m 644 %{S:11} %{buildroot}/%{_prefix}/lib/systemd/system/
 ln -s ../after-local.service %{buildroot}/%{_prefix}/lib/systemd/system/multi-user.target.wants/
@@ -1203,6 +1211,8 @@ exit 0
 %dir %{_prefix}/lib/systemd/system/dbus.target.wants
 %dir %{_prefix}/lib/systemd/system/getty@tty1.service.d
 %{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf
+%dir %{_prefix}/lib/systemd/system/systemd-sysctl.service.d
+%{_prefix}/lib/systemd/system/systemd-sysctl.service.d/after.conf
 %if ! 0%{?bootstrap}
 %{_prefix}/lib/systemd/system-generators/systemd-cryptsetup-generator
 %endif