diff --git a/parted-1.9.0-swap-flag.patch b/parted-1.9.0-swap-flag.patch
index a311ce3..59f2929 100644
--- a/parted-1.9.0-swap-flag.patch
+++ b/parted-1.9.0-swap-flag.patch
@@ -109,7 +109,7 @@ index 7ec15ee..f8307c5 100644
 +			dos_data->prep = 0;
 +		}
 +		dos_data->swap = state;
-+		return ped_partition_set_system (part, ped_file_system_type_get("linux-swap"));
++		return ped_partition_set_system (part, part->fs_type);
 +
  	default:
  		return 0;
diff --git a/parted.spec b/parted.spec
index 06cbeff..3275878 100644
--- a/parted.spec
+++ b/parted.spec
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program
 Name:    parted
 Version: 1.9.0
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
@@ -142,6 +142,10 @@ fi
 %{_exec_prefix}/%{_lib}/pkgconfig/libparted.pc
 
 %changelog
+* Thu Oct  8 2009 Hans de Goede <hdegoede@redhat.com> 1.9.0-17
+- Only change the partition type to 82 when setting the swap flag on dos
+  labels, not when resetting it
+
 * Tue Oct  6 2009 Hans de Goede <hdegoede@redhat.com> 1.9.0-16
 - Correctly handle GPT labels on big endian machines