diff --git a/perl-xCAT/perl-xCAT.spec b/perl-xCAT/perl-xCAT.spec
index 38f9abb0a..7877fb708 100644
--- a/perl-xCAT/perl-xCAT.spec
+++ b/perl-xCAT/perl-xCAT.spec
@@ -21,7 +21,7 @@ Provides: perl(xCAT) = %{version}
 Provides perl xCAT libraries for core functionality.  Required for all xCAT installations.
 Includes xCAT::Table, xCAT::NodeRange, among others.
 
-%prep -n perl-xCAT
+%prep
 %setup -q
 %build
 # This phase is done in (for RH): /usr/src/redhat/BUILD/perl-xCAT-2.0
diff --git a/xCAT-client/xCAT-client.spec b/xCAT-client/xCAT-client.spec
index ca38a5b10..dd3bd051b 100644
--- a/xCAT-client/xCAT-client.spec
+++ b/xCAT-client/xCAT-client.spec
@@ -22,7 +22,7 @@ Provides: xCAT-client = %{version}
 %description
 xCAT-client provides the fundamental xCAT commands (chtab, chnode, rpower, etc) helpful in administrating systems at scale, with particular attention paid to large HPC clusters.
 
-%prep -n xCAT-client
+%prep
 %setup -q
 %build
 # This phase is done in (for RH): /usr/src/redhat/BUILD/xCAT-client-2.0
@@ -152,6 +152,7 @@ ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/lsdef
 ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/rmdef
 ln -sf ../bin/xcatDBcmds $RPM_BUILD_ROOT/%{prefix}/bin/xcat2nim
 ln -sf ../bin/xdsh $RPM_BUILD_ROOT/%{prefix}/bin/xdcp
+ln -sf ../bin/xcatclientnnr $RPM_BUILD_ROOT/%{prefix}/sbin/mknb
 
 %clean
 # This step does not happen until *after* the %files packaging below
diff --git a/xCAT-server/sbin/mknb b/xCAT-server/sbin/mknb
deleted file mode 120000
index 20d9291ac..000000000
--- a/xCAT-server/sbin/mknb
+++ /dev/null
@@ -1 +0,0 @@
-../bin/xcatclientnnr
\ No newline at end of file
diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec
index 71f24a909..b64bcb1ed 100644
--- a/xCAT-server/xCAT-server.spec
+++ b/xCAT-server/xCAT-server.spec
@@ -27,7 +27,7 @@ Provides: xCAT-server = %{epoch}:%{version}
 %description
 xCAT-server provides the core server and configuration management components of xCAT.  This package should be installed on your management server
 
-%prep -n xCAT-server
+%prep
 %setup -q -n xCAT-server
 %build
 %install