diff --git a/.gitignore b/.gitignore
index 7d712b42377..8091ecdba71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,5 +48,7 @@ solr/contrib/morphlines-core/test-lib/
 
 solr/core/test-lib/
 
+solr/server/logs/
+solr/server/solr/zoo_data/
 solr/server/solr-webapp
 solr/server/start.jar
diff --git a/dev-tools/idea/.idea/modules.xml b/dev-tools/idea/.idea/modules.xml
index 75da2f588eb..6fbe496772f 100644
--- a/dev-tools/idea/.idea/modules.xml
+++ b/dev-tools/idea/.idea/modules.xml
@@ -43,6 +43,7 @@
 
       <module group="Solr" filepath="$PROJECT_DIR$/solr/core/src/java/solr-core.iml" />
       <module group="Solr" filepath="$PROJECT_DIR$/solr/core/src/solr-core-tests.iml" />
+      <module group="Solr" filepath="$PROJECT_DIR$/solr/server/server.iml" />
       <module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/src/java/solrj.iml" />
       <module group="Solr" filepath="$PROJECT_DIR$/solr/solrj/src/solrj-tests.iml" />
       <module group="Solr" filepath="$PROJECT_DIR$/solr/test-framework/solr-test-framework.iml" />
diff --git a/dev-tools/idea/.idea/workspace.xml b/dev-tools/idea/.idea/workspace.xml
index a7c68dec105..7750e90e15b 100644
--- a/dev-tools/idea/.idea/workspace.xml
+++ b/dev-tools/idea/.idea/workspace.xml
@@ -340,8 +340,16 @@
       <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
       <patterns><pattern testClass=".*\.Test[^.]*|.*\.[^.]*Test" /></patterns>
     </configuration>
- 
-    <list size="41">
+    <configuration default="false" name="solrcloud" type="Application" factoryName="Application" singleton="true">
+      <option name="MAIN_CLASS_NAME" value="org.eclipse.jetty.start.Main" />
+      <option name="VM_PARAMETERS" value="-DzkRun -Dhost=127.0.0.1 -Duser.timezone=UTC -Djetty.home=$PROJECT_DIR$/solr/server -Dsolr.solr.home=$PROJECT_DIR$/solr/server/solr -Dsolr.install.dir=$PROJECT_DIR$/solr -Dsolr.log=$PROJECT_DIR$/solr/server/logs/solr.log" />
+      <option name="PROGRAM_PARAMETERS" value="--module=http" />
+      <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/solr/server" />
+      <option name="PARENT_ENVS" value="true" />
+      <module name="server" />
+    </configuration>
+
+    <list size="42">
       <item index="0" class="java.lang.String" itemvalue="JUnit.Lucene core" />
       <item index="1" class="java.lang.String" itemvalue="JUnit.Module analyzers-common" />
       <item index="2" class="java.lang.String" itemvalue="JUnit.Module analyzers-icu" />
@@ -383,6 +391,7 @@
       <item index="38" class="java.lang.String" itemvalue="JUnit.Solr uima contrib" />
       <item index="39" class="java.lang.String" itemvalue="JUnit.Solr velocity contrib" />
       <item index="40" class="java.lang.String" itemvalue="JUnit.Solrj" />
+      <item index="41" class="java.lang.String" itemvalue="Application.solrcloud" />
     </list>
   </component>
 </project>
diff --git a/dev-tools/idea/solr/server/server.iml b/dev-tools/idea/solr/server/server.iml
new file mode 100644
index 00000000000..3b742a68f38
--- /dev/null
+++ b/dev-tools/idea/solr/server/server.iml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/../../idea-build/solr/server/classes/java" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module-library">
+      <library>
+        <CLASSES>
+          <root url="jar://$MODULE_DIR$/start.jar!/" />
+        </CLASSES>
+        <JAVADOC />
+        <SOURCES />
+      </library>
+    </orderEntry>
+  </component>
+</module>
\ No newline at end of file
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index d94b46325b8..672a9b767d8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -123,6 +123,8 @@ Optimizations
 * SOLR-8937: bin/post (SimplePostTool) now streams the standard input instead of buffering fully.
   (David Smiley)
 
+* SOLR-8973: Zookeeper frenzy when a core is first created. (Janmejay Singh, Scott Blum, shalin)
+
 Other Changes
 ----------------------
 * SOLR-7516: Improve javadocs for JavaBinCodec, ObjectResolver and enforce the single-usage policy.
@@ -152,7 +154,7 @@ Other Changes
 
 * SOLR-9015: Adds SelectStream as a default function in the StreamHandler (Dennis Gove)
 
-* SOLR-8973: Zookeeper frenzy when a core is first created. (Janmejay Singh, Scott Blum, shalin)
+* SOLR-8929: Add an idea module for solr/server to enable launching start.jar (Scott Blum, Steve Rowe)
 
 ==================  6.0.0 ==================