diff --git a/.gitignore b/.gitignore
index 7648616..5fe8fc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/mysql-5.5.16-nodocs.tar.gz
+/mysql-5.5.17-nodocs.tar.gz
diff --git a/mysql.spec b/mysql.spec
index d420c11..9d82a43 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,10 +1,6 @@
 Name: mysql
-Version: 5.5.16
-Release: 4%{?dist}
-# Update this whenever F15 gets rebased; it must be NVR-greater than F15 pkg.
-# Our convention for the life of F15 is that sysv packages will be numbered
-# 1dist.n while systemd packages will be 2dist and higher.
-%global first_systemd_version 5.5.15-2
+Version: 5.5.17
+Release: 1%{?dist}
 
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -439,16 +435,20 @@ fi
 /bin/chmod 0755 /var/lib/mysql
 /bin/touch /var/log/mysqld.log
 
-# Run this when upgrading from SysV initscript to native systemd unit
-%triggerun server -- mysql-server < %{first_systemd_version}
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply mysqld
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save mysqld >/dev/null 2>&1 || :
+# Handle upgrading from SysV initscript to native systemd unit.
+# We can tell if a SysV version of mysql was previously installed by
+# checking to see if the initscript is present.
+%triggerun server -- mysql-server
+if [ -f /etc/rc.d/init.d/mysqld ]; then
+    # Save the current service runlevel info
+    # User must manually run systemd-sysv-convert --apply mysqld
+    # to migrate them to systemd targets
+    /usr/bin/systemd-sysv-convert --save mysqld >/dev/null 2>&1 || :
 
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del mysqld >/dev/null 2>&1 || :
-/bin/systemctl try-restart mysqld.service >/dev/null 2>&1 || :
+    # Run these because the SysV package being removed won't do them
+    /sbin/chkconfig --del mysqld >/dev/null 2>&1 || :
+    /bin/systemctl try-restart mysqld.service >/dev/null 2>&1 || :
+fi
 
 %preun server
 if [ $1 = 0 ]; then
@@ -656,6 +656,11 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sat Nov 12 2011 Tom Lane <tgl@redhat.com> 5.5.17-1
+- Update to MySQL 5.5.17, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.5/en/news-5-5-17.html
+- Get rid of version-number assumption in sysv-to-systemd conversion trigger
+
 * Wed Nov 02 2011 Honza Horak <hhorak@redhat.com> 5.5.16-4
 - Don't assume all ethernet devices are named ethX
 Resolves: #682365
diff --git a/sources b/sources
index f7951be..471ee1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f73cbec75c7d5937964271497c14ee39  mysql-5.5.16-nodocs.tar.gz
+48b4df648747f49468c4753db786acbf  mysql-5.5.17-nodocs.tar.gz