diff --git a/search-server/spacewalk-search/spacewalk-search.changes.cbosdo.search_javaopts b/search-server/spacewalk-search/spacewalk-search.changes.cbosdo.search_javaopts
new file mode 100644
index 000000000000..a6e88ed11203
--- /dev/null
+++ b/search-server/spacewalk-search/spacewalk-search.changes.cbosdo.search_javaopts
@@ -0,0 +1 @@
+- Add JAVA_OPTS configuration for rhn-search
diff --git a/search-server/spacewalk-search/src/config/rhn-search b/search-server/spacewalk-search/src/config/rhn-search
index 74f54c3d6389..41e46be752a3 100755
--- a/search-server/spacewalk-search/src/config/rhn-search
+++ b/search-server/spacewalk-search/src/config/rhn-search
@@ -10,7 +10,7 @@ fi
 SEARCH_CLASSPATH="${SEARCH_JARS}:${SEARCH_RHN_CLASSPATH}:${SEARCH_RHN_JARS}"
 SEARCH_PARAMS="-Dfile.encoding=UTF-8 -Xms${SEARCH_INIT_MEMORY}m -Xmx${SEARCH_MAX_MEMORY}m"
 
-JAVACMD="/usr/bin/java -Djava.library.path=${SEARCH_LIBRARY_PATH} -classpath ${SEARCH_CLASSPATH} ${SEARCH_PARAMS}"
+JAVACMD="/usr/bin/java ${JAVA_OPTS} -Djava.library.path=${SEARCH_LIBRARY_PATH} -classpath ${SEARCH_CLASSPATH} ${SEARCH_PARAMS}"
 
 if [[ $# -eq 0 ]]; then
     $JAVACMD -Dlog4j2.configurationFile=/usr/share/rhn/search/classes/log4j2.xml com.redhat.satellite.search.Main
diff --git a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
index 577e4e6e8db3..847413b58781 100644
--- a/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
+++ b/search-server/spacewalk-search/src/config/search/rhn_search_daemon.conf
@@ -9,3 +9,4 @@ SEARCH_RHN_JARS="/usr/share/rhn/lib/spacewalk-asm.jar:/usr/share/rhn/lib/rhn.jar
 SEARCH_JARS="/usr/share/rhn/search/lib/*"
 SEARCH_INIT_MEMORY=32
 SEARCH_MAX_MEMORY=512
+JAVA_OPTS=""