diff --git a/pkg-scripts/athena-server.spec b/pkg-scripts/athena-server.spec
index 643120f98b..7910c8114b 100644
--- a/pkg-scripts/athena-server.spec
+++ b/pkg-scripts/athena-server.spec
@@ -40,6 +40,9 @@ strip --strip-all $RPM_BUILD_ROOT/opt/athena/*
 chrpath -d $RPM_BUILD_ROOT/opt/athena/*
 install -m 0755 -t $RPM_BUILD_ROOT/opt/athena $ATHENA/source/pkg-scripts/new-server
 install -d $RPM_BUILD_ROOT/opt/athena/lib
+install -m 0644 -t $RPM_BUILD_ROOT/opt/athena/lib $ATHENA/build/libraries/*/*.so
+strip --strip-all $RPM_BUILD_ROOT/opt/athena/lib/*
+chrpath -d $RPM_BUILD_ROOT/opt/athena/lib/*
 install -m 0644 -t $RPM_BUILD_ROOT/opt/athena/lib $ATHENA/qt5-install/lib/libQt5Network.so.*.*.*
 install -m 0644 -t $RPM_BUILD_ROOT/opt/athena/lib $ATHENA/qt5-install/lib/libQt5Core.so.*.*.*
 install -m 0644 -t $RPM_BUILD_ROOT/opt/athena/lib $ATHENA/qt5-install/lib/libQt5Widgets.so.*.*.*
diff --git a/pkg-scripts/make-rpm-server b/pkg-scripts/make-rpm-server
index 30aaa418fe..f0e4c3728a 100755
--- a/pkg-scripts/make-rpm-server
+++ b/pkg-scripts/make-rpm-server
@@ -1,14 +1,17 @@
 #!/bin/sh
 
-ATHENA=`realpath ../..`
-GITDATE=`git log -n 1 --format=raw | grep author | cut -d' ' -f 4 | xargs -I {} date -d @{} +"%Y%m%d"`
-GITCOMMIT=`git rev-parse HEAD | cut -c 1-7`
+if [ "$ATHENA" = "" ]; then
+	        ATHENA=`realpath ../..`
+fi
+GITDATE=`git -C $ATHENA/source log -n 1 --format=raw | grep author | cut -d">" -f 2 | cut -d" " -f 2 | xargs -I {} date -d @{} +"%Y%m%d"`
+GITCOMMIT=`git -C $ATHENA/source rev-parse HEAD | cut -c 1-7`
 VERSION=0.86.0_K1_${GITDATE}_${GITCOMMIT}
 
 DEPENDS=mesa-libGL,`ls \
 		$ATHENA/build/assignment-client/assignment-client \
 		$ATHENA/build/domain-server/domain-server \
 		$ATHENA/build/tools/oven/oven \
+		$ATHENA/build/libraries/*/*.so \
 		$ATHENA/qt5-install/lib/libQt5Network.so.*.*.* \
 		$ATHENA/qt5-install/lib/libQt5Core.so.*.*.* \
 		$ATHENA/qt5-install/lib/libQt5Widgets.so.*.*.* \