diff --git a/rpm/buildrpms.sh b/rpm/buildrpms.sh
index a6569c41587d..d87844f0ebcb 100755
--- a/rpm/buildrpms.sh
+++ b/rpm/buildrpms.sh
@@ -68,11 +68,11 @@ fi
 
 # Get the version string
 major=$(grep -e 'SET(CPACK_PACKAGE_VERSION_MAJOR' ../CMakeLists.txt |
-    sed 's/.*\([0-9]\).*/\1/')
+        sed -r 's/.*\"([0-9]+)\".*/\1/g')
 minor=$(grep -e 'SET(CPACK_PACKAGE_VERSION_MINOR' ../CMakeLists.txt |
-    sed 's/.*\([0-9]\).*/\1/')
+        sed -r 's/.*\"([0-9]+)\".*/\1/g')
 patch=$(grep -e 'SET(CPACK_PACKAGE_VERSION_PATCH' ../CMakeLists.txt |
-    sed 's/.*\([0-9]\).*/\1/')
+        sed -r 's/.*\"([0-9]+)\".*/\1/g')
 
 version=$(echo $major.$minor.$patch)
 
diff --git a/rpm/default.cfg b/rpm/default.cfg
index 302027c92577..93a11f6a7f95 100644
--- a/rpm/default.cfg
+++ b/rpm/default.cfg
@@ -13,6 +13,8 @@ ARCHS=( "fedora-20-i386"
         "fedora-20-x86_64"
         "fedora-21-i386"
         "fedora-21-x86_64"
+        "fedora-22-i386"
+        "fedora-22-x86_64"
       )
 
 # Which git branch to export. Normally take the current