diff --git a/src/modules/fstab/main.py b/src/modules/fstab/main.py
index 876a6f30b..5cfb62efb 100644
--- a/src/modules/fstab/main.py
+++ b/src/modules/fstab/main.py
@@ -55,7 +55,6 @@ FS_MAP = {
     "fat16": "vfat",
     "fat32": "vfat",
     "linuxswap": "swap",
-    "linux-swap": "swap",
 }
 
 
@@ -226,7 +225,7 @@ class FstabGenerator(object):
 
     def generate_fstab_line_info(self, partition):
         """ Generates information for each fstab entry. """
-        filesystem = partition["fs"].lower()
+        filesystem = partition["fs"].lower().strip("-")
         has_luks = "luksMapperName" in partition
         mount_point = partition["mountPoint"]
         disk_name = disk_name_for_partition(partition)