diff --git a/lvm2.spec b/lvm2.spec
index 32fa1bc..c9288a4 100644
--- a/lvm2.spec
+++ b/lvm2.spec
@@ -5,6 +5,7 @@
 %define enable_openais 1
 %define enable_cmirror 1
 %define enable_udev 1
+%define enable_systemd 1
 %define enable_lvmetad 0
 
 %if "%{fedora}" == "12"
@@ -22,18 +23,22 @@
 %define udev_version 158-1
 %else
 %if "%{fedora}" == "15" 
-%define enable_systemd 1
 %define udev_version 158-1
 %else
 %if "%{fedora}" == "16"
-%define enable_systemd 1
 %define udev_version 158-1
 %else
-%define enable_systemd 1
-%define enable_cmirror 1
+%if "%{fedora}" == "17"
 %define udev_version 176-1
 %define enable_thin 1
 %define enable_openais 0
+%define corosync_version 1.99.1-1
+%else
+%define udev_version 176-1
+%define enable_thin 1
+%define enable_openais 0
+%define corosync_version 1.99.8-1
+%endif
 %endif
 %endif
 %endif
@@ -52,7 +57,6 @@
 %define clusterlib_version 3.0.6-1
 %define configure_cluster --with-cluster=internal --with-clvmd=cman,openais,corosync
 %else
-%define corosync_version 1.99.8-1
 %define dlm_version 3.99.0-1
 %define configure_cluster --with-cluster=internal --with-clvmd=corosync
 %endif