diff --git a/.cvsignore b/.cvsignore
index 7a413e7..712570b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-initscripts-9.11.tar.bz2
+initscripts-9.12.tar.bz2
diff --git a/initscripts.spec b/initscripts.spec
index 9a30519..d7582c2 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -2,7 +2,7 @@
 
 Summary: The inittab file and the /etc/init.d scripts
 Name: initscripts
-Version: 9.11
+Version: 9.12
 # ppp-watch is GPLv2+, everything else is GPLv2
 License: GPLv2 and GPLv2+
 Group: System Environment/Base
@@ -40,7 +40,7 @@ Conflicts: dmraid < 1.0.0.rc16-7
 Conflicts: e2fsprogs < 1.15
 # http://bugzilla.redhat.com/show_bug.cgi?id=252973
 Conflicts: nut < 2.2.0
-Conflicts: NetworkManager < 1:0.8.0
+Conflicts: NetworkManager < 1:0.8.0-12.git20100504
 Obsoletes: hotplug <= 3:2004_09_23-10.1
 Requires(pre): /usr/sbin/groupadd
 Requires(post): /sbin/chkconfig, coreutils
@@ -241,6 +241,9 @@ rm -rf $RPM_BUILD_ROOT
 /etc/profile.d/debug*
 
 %changelog
+* Wed May  5 2010 Bill Nottingham <notting@redhat.com> - 9.12-1
+- update for final nmcli syntax
+
 * Mon May  3 2010 Bill Nottingham <notting@redhat.com> - 9.11-1
 - init/plymouth-shutdown.conf: add 'task' here as well
 
diff --git a/sources b/sources
index e24acfc..d74f2c0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b576406455fa87bf5d329bd161df4b09  initscripts-9.11.tar.bz2
+c73218ac6ae1e5ea3a24bd10669e8a61  initscripts-9.12.tar.bz2