diff --git a/build.sh b/build.sh
index 5420f72..f394353 100644
--- a/build.sh
+++ b/build.sh
@@ -84,7 +84,47 @@ done
 case "$1" in
     rpm)
         cd $EmsBEDir
-        make rpm
+
+        # make rpm
+    	# clear build cache
+    	rm -rf $(FrontBuildDir)/front/*
+    	rm -rf $(RpmFEBuildDir)/front/*
+    	rm -rf $(RpmBuildDir)/BUILD/usr/local/omc/etc/db/*
+
+    	cp -rf $(RestagentDir)/$(RESTAGENT) $(BuildOMCBinDir)
+    	cp -rf $(CrontaskDir)/$(CRONTASK) $(BuildOMCBinDir)
+    	cp -rf $(SshSvcDir)/$(SshSvcBin) $(BuildOMCBinDir)
+    	cp -rf $(CapTraceDir)/$(CapTraceBin) $(BuildOMCBinDir)
+    	cp -rf $(Data2htmlDir)/$(Data2htmlBin) $(BuildOMCBinDir)		
+        #   $(BinWriterDir)/binWriter $(BuildOMCBinDir)/$(RESTAGENT) $(RestagentSize)
+        #	$(BinWriterDir)/binWriter $(BuildOMCBinDir)/$(CRONTASK) $(CrontaskSize)
+        #	cp -rf $(MiscDir)/ne-hosts $(BuildOMCBinDir)
+        #	cp -rf ./nbi/$(NBI_ALARM)/bin/$(NBI_ALARM) $(BinDir2)
+        #	cp -rf ./nbi/$(NBI_AGENT)/bin/$(NBI_AGENT) $(BinDir2)
+        #	cp -rf ./$(4A_AGENT)/bin/$(4A_AGENT) $(BinDir2)
+    	cp -rf $(MiscDir)/* $(BuildOMCBinDir)
+        #	rm -rf $(BinDir2)/ne-hosts
+    	cp -rf $(ConfigEtcDir)/* $(BuildOMCEtcDir)
+    	rm -rf $(BuildOMCEtcDir)/db/*
+    	cp -rf $(DBSQLSrcDir)/* $(BuildOMCEtcDir)/db/
+	    #Get SQL from database, recover from git
+	    if [ "$2" = "db" ]; then
+    		cd ${DumpToolDir}
+    		chmod +x ${DumpToolDir}/dumpsql.sh
+    		${DumpToolDir}/dumpsql.sh
+	    fi         
+    	cp -rf $(ConfigSystemdDir)/* $(BuildLibSystemDir)		
+    	#unzip $(FrontSrcDir)/front.zip -d $(FrontBuildDir) >/dev/null
+    	mkdir -p $(FrontBuildDir)/front
+    	cp -rf $(EmsFEVue3Dir)/* $(FrontBuildDir)/front >/dev/null
+    	chmod 755 $(BuildOMCBinDir)/*
+        #	chmod 755 $(BinDir2)/*
+    	cp -rf $(BuildDir)/* $(RpmBuildDir)/BUILD/
+    	#cp -rf $(BuildDir)/nginx $(RpmBuildDir)/BUILD/etc/
+    	#cp -rf $(BuildDir)/systemd $(RpmBuildDir)/BUILD/lib/
+    	cd $(RpmBuildDir)
+    	rpmbuild -bb -D "_topdir $(RpmBuildDir)" $(RpmBuildDir)/SPECS/omc.spec        
+    
         mv -f $RpmsDir/$RpmArch/$RpmPkgName $ReleaseDir/"$1"s/$RelArch/$RpmPkgRename
         cd $ReleaseDir/"$1"s/$RelArch
         rm -f omc-md5sum.txt
@@ -122,14 +162,14 @@ case "$1" in
     	cp -rf ${ConfigEtcDir}/* ${BuildOMCEtcDir}
     	rm -rf ${BuildOMCEtcDir}/db/*
     	cp -rf ${DBSQLSrcDir}/* ${BuildOMCEtcDir}/db/
-    	cp -rf ${ConfigSystemdDir}/* ${BuildLibSystemDir}
-    	cp -rf ${EmsFEVue3Dir}/* ${FrontBuildDir}/front >/dev/null
-	    #Get SQL from database
+	    #Get SQL from database, recover from git
 	    if [ "$2" = "db" ]; then
     		cd ${DumpToolDir}
     		chmod +x ${DumpToolDir}/dumpsql.sh
     		${DumpToolDir}/dumpsql.sh
 	    fi 
+    	cp -rf ${ConfigSystemdDir}/* ${BuildLibSystemDir}
+    	cp -rf ${EmsFEVue3Dir}/* ${FrontBuildDir}/front >/dev/null
     	chmod 755 ${BuildOMCBinDir}/*
     	chmod 755 ${DebBuildDir}/DEBIAN/preinst	
     	chmod 755 ${DebBuildDir}/DEBIAN/postinst