diff --git a/freeswitch-config-rayo.spec b/freeswitch-config-rayo.spec
index cefc22312d..0a164ca104 100644
--- a/freeswitch-config-rayo.spec
+++ b/freeswitch-config-rayo.spec
@@ -28,7 +28,8 @@
 #
 ######################################################################################################################
 
-%define version 1.7.0
+%define nonparsedversion 1.7.0
+%define version %(echo '%{nonparsedversion}' | sed 's/-//g')
 %define release 1
 
 %define fsname freeswitch
@@ -74,7 +75,7 @@ Summary: Rayo configuration for the FreeSWITCH Open Source telephone platform.
 Group: System/Libraries
 Packager: Chris Rienzo
 URL: http://www.freeswitch.org/
-Source0: freeswitch-%{version}.tar.bz2
+Source0: freeswitch-%{nonparsedversion}.tar.bz2
 Requires: freeswitch
 Requires: freeswitch-application-conference
 Requires: freeswitch-application-esf
@@ -103,7 +104,7 @@ BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 FreeSWITCH rayo server implementation.
 
 %prep
-%setup -b0 -q -n freeswitch-%{version}
+%setup -b0 -q -n freeswitch-%{nonparsedversion}
 
 %build
 
diff --git a/freeswitch.spec b/freeswitch.spec
index 128669ac47..29b9c8728c 100644
--- a/freeswitch.spec
+++ b/freeswitch.spec
@@ -49,7 +49,8 @@
 %{?with_mod_shout:%define build_mod_shout 1 }
 %{?with_mod_opusfile:%define build_mod_opusfile 1 }
 
-%define version 1.7.0
+%define nonparsedversion 1.7.0
+%define version %(echo '%{nonparsedversion}' | sed 's/-//g')
 %define release 1
 
 ######################################################################################################################
@@ -118,7 +119,7 @@ Vendor:       	http://www.freeswitch.org/
 #					Source files and where to get them
 #
 ######################################################################################################################
-Source0:        http://files.freeswitch.org/%{name}-%{version}.tar.bz2
+Source0:        http://files.freeswitch.org/%{name}-%{nonparsedversion}.tar.bz2
 Source1:	http://files.freeswitch.org/downloads/libs/v8-3.24.14.tar.bz2
 Source2:	http://files.freeswitch.org/downloads/libs/mongo-c-driver-1.1.0.tar.gz
 Source3:	http://files.freeswitch.org/downloads/libs/pocketsphinx-0.8.tar.gz
@@ -1430,7 +1431,7 @@ Basic vanilla config set for the FreeSWITCH Open Source telephone platform.
 ######################################################################################################################
 
 %prep
-%setup -b0 -q
+%setup -b0 -q -n %{name}-%{nonparsedversion}
 cp %{SOURCE1} libs/
 cp %{SOURCE2} libs/
 cp %{SOURCE3} libs/
diff --git a/scripts/ci/common.sh b/scripts/ci/common.sh
index 6158356a1c..cecb1289bc 100755
--- a/scripts/ci/common.sh
+++ b/scripts/ci/common.sh
@@ -123,11 +123,11 @@ set_fs_ver () {
     rpm_version="$major.$minor.$micro"
   fi
 
-  sed -e "s|\(%define version \).*|\1$rpm_version|"  \
+  sed -e "s|\(%define nonparsedversion \).*|\1$rpm_version|"  \
        freeswitch.spec > freeswitch.spec.$$
   mv freeswitch.spec.$$ freeswitch.spec
 
-  sed -e "s|\(%define version \).*|\1$rpm_version|"  \
+  sed -e "s|\(%define nonparsedversion \).*|\1$rpm_version|"  \
        freeswitch-config-rayo.spec > freeswitch-config-rayo.spec.$$
   mv freeswitch-config-rayo.spec.$$ freeswitch-config-rayo.spec