diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 67f30665de9..ceb66633ac8 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -699,6 +699,9 @@ Other Changes
 * SOLR-6943: HdfsDirectoryFactory should fall back to system props for most of it's config
   if it is not found in solrconfig.xml. (Mark Miller, Mike Drob)
 
+* SOLR-6926: "ant example" makes no sense anymore - should be "ant server" 
+  (Ramkumar Aiyengar, Timothy Potter)
+
 ==================  4.10.3 ==================
 
 Bug Fixes
diff --git a/solr/README.txt b/solr/README.txt
index faaf3961954..2895cfd885c 100644
--- a/solr/README.txt
+++ b/solr/README.txt
@@ -156,7 +156,7 @@ Instructions for Building Apache Solr from Source
    for building, testing, and packaging Solr.
   
    NOTE: 
-   To see Solr in action, you may want to use the "ant example" command to build
+   To see Solr in action, you may want to use the "ant server" command to build
    and package Solr into the server/webapps directory. See also server/README.txt.
 
 
diff --git a/solr/build.xml b/solr/build.xml
index 852b7b2a41f..e58ff1250f5 100644
--- a/solr/build.xml
+++ b/solr/build.xml
@@ -20,8 +20,8 @@
   
   <target name="usage" description="Prints out instructions">
     <echo message="Welcome to the Solr project!" />
-    <echo message="Use 'ant example' to create a runnable example configuration." />
-    <echo message="Use 'ant run-example' to create and run the example." />
+    <echo message="Use 'ant server' to create the Solr server." />
+    <echo message="Use 'bin/solr' to run the Solr after it is created." />
     <echo message="And for developers:"/>
     <echo message="Use 'ant clean' to clean compiled files." />
     <echo message="Use 'ant compile' to compile the source code." />
@@ -38,9 +38,9 @@
   <!-- ========================================================================= -->
   <!-- ============================== USER TASKS =============================== -->
   <!-- ========================================================================= -->
- 
-  <target name="example" description="Creates a runnable example configuration."
-          depends="dist-contrib,build-war">
+
+  <target name="server" depends="dist-contrib,server-war"
+          description="Creates a Solr server">
     <jar destfile="${example}/exampledocs/post.jar"
          basedir="${dest}/solr-core/classes/java"
          includes="org/apache/solr/util/SimplePostTool*.class">
@@ -51,10 +51,10 @@
     <delete includeemptydirs="true">
       <fileset dir="${server.dir}/solr-webapp" includes="**/*"/>
     </delete>
-    <echo>See ${example}/README.txt for how to run the Solr example configuration.</echo>
+    <echo>See ${common-solr.dir}/README.txt for how to run the Solr server.</echo>
   </target>
   
-  <target name="run-example" depends="example"
+  <target name="run-example" depends="server"
           description="Run Solr interactively, via Jetty.  -Dexample.debug=true to enable JVM debugger">
     <property name="example.debug.suspend" value="n"/>
     <property name="example.jetty.port" value="8983"/>
@@ -337,7 +337,7 @@
   
   <target name="dist"
           description="Creates the Solr distribution files."
-          depends="dist-solrj, dist-core, dist-test-framework, dist-contrib, build-war" />
+          depends="dist-solrj, dist-core, dist-test-framework, dist-contrib" />
  
   <target name="dist-test-framework" depends="init-dist"
           description="Creates the Solr test-framework JAR.">
@@ -351,9 +351,9 @@
     <contrib-crawl target="dist" failonerror="true" />
   </target>
   
-  <target name="build-war"
+  <target name="server-war"
           description="Creates the Solr WAR Distribution file.">
-    <ant dir="webapp" target="dist" inheritall="false">
+    <ant dir="webapp" target="server-war" inheritall="false">
       <propertyset refid="uptodate.and.compiled.properties"/>
     </ant>
   </target>
@@ -450,7 +450,7 @@
       <param name="called.from.create-package" value="true"/>
       <target name="init-dist"/>
       <target name="dist"/>
-      <target name="example"/>
+      <target name="server"/>
       <target name="documentation"/>
     </antcall>
     <mkdir dir="${dest}/${fullnamever}"/>
diff --git a/solr/cloud-dev/cli-test-solrcloud-start.sh b/solr/cloud-dev/cli-test-solrcloud-start.sh
index d2776c07fca..1634ab721ba 100755
--- a/solr/cloud-dev/cli-test-solrcloud-start.sh
+++ b/solr/cloud-dev/cli-test-solrcloud-start.sh
@@ -16,7 +16,7 @@ rm -r -f server/solr/zoo_data
 rm -r -f server/solr/data
 rm -f server/server.log
 
-ant example dist
+ant server dist
 
 cp -r -f server server2
 cp -r -f server server3
diff --git a/solr/cloud-dev/example1.sh b/solr/cloud-dev/example1.sh
index cb1cbf3ec61..418642d1764 100755
--- a/solr/cloud-dev/example1.sh
+++ b/solr/cloud-dev/example1.sh
@@ -10,7 +10,7 @@ rm -r -f example/solr/zoo_data
 rm -r -f example/solr/collection1/data
 rm -f example/example.log
 
-ant example dist
+ant server dist
 
 cp -r -f example example2
 
diff --git a/solr/cloud-dev/example2.sh b/solr/cloud-dev/example2.sh
index fcd57b0843f..3c9f23268fc 100755
--- a/solr/cloud-dev/example2.sh
+++ b/solr/cloud-dev/example2.sh
@@ -12,7 +12,7 @@ rm -r -f example/solr/zoo_data
 rm -r -f example/solr/collection1/data
 rm -f example/example.log
 
-ant example dist
+ant server dist
 
 cp -r -f example example2
 cp -r -f example example3
diff --git a/solr/cloud-dev/example3.sh b/solr/cloud-dev/example3.sh
index 0f7665721c6..404db018489 100755
--- a/solr/cloud-dev/example3.sh
+++ b/solr/cloud-dev/example3.sh
@@ -12,7 +12,7 @@ rm -r -f example/solr/zoo_data
 rm -r -f example/solr/collection1/data
 rm -f example/example.log
 
-ant example dist
+ant server dist
 
 cp -r -f example example2
 cp -r -f example example3
diff --git a/solr/cloud-dev/functions.sh b/solr/cloud-dev/functions.sh
index 3b2da92bf11..e7ab517d0f8 100755
--- a/solr/cloud-dev/functions.sh
+++ b/solr/cloud-dev/functions.sh
@@ -11,7 +11,7 @@ rebuild() {
 	rm -r -f build
 	rm -r -f server/solr/zoo_data
 	rm -f server/server.log
-	ant example dist
+	ant server dist
 }
 
 setports() {
diff --git a/solr/cloud-dev/solrcloud-extzk-start.sh b/solr/cloud-dev/solrcloud-extzk-start.sh
index 67d1064ab45..419e0e1c582 100755
--- a/solr/cloud-dev/solrcloud-extzk-start.sh
+++ b/solr/cloud-dev/solrcloud-extzk-start.sh
@@ -18,7 +18,7 @@ rm -r -f server/solr/zoo_data
 rm -r -f server/solr/collection1/data
 rm -f server/server.log
 
-ant example dist
+ant server dist
 
 cp -r -f server server2
 cp -r -f server server3
diff --git a/solr/cloud-dev/solrcloud-multi-start.sh b/solr/cloud-dev/solrcloud-multi-start.sh
index ebea0abc50e..937f32ed09e 100755
--- a/solr/cloud-dev/solrcloud-multi-start.sh
+++ b/solr/cloud-dev/solrcloud-multi-start.sh
@@ -18,7 +18,7 @@ rm -r -f server/solr/zoo_data
 rm -r -f server/solr/collection1/data
 rm -f server/server.log
 
-ant example dist
+ant server dist
 
 cp -r -f server server2
 cp -r -f server server3
diff --git a/solr/cloud-dev/solrcloud-start.sh b/solr/cloud-dev/solrcloud-start.sh
index 3904fcf60c9..e0f2aa7f1e4 100755
--- a/solr/cloud-dev/solrcloud-start.sh
+++ b/solr/cloud-dev/solrcloud-start.sh
@@ -36,7 +36,7 @@ rm -r -f server/solr/zoo_data
 rm -f server/server.log
 
 ant -f ../build.xml clean
-ant example dist
+ant server dist
 
 rm -r server/solr-webapp/*
 unzip server/webapps/solr.war -d server/solr-webapp/webapp
diff --git a/solr/webapp/build.xml b/solr/webapp/build.xml
index 6fc3d7169ea..ec8138e78e9 100644
--- a/solr/webapp/build.xml
+++ b/solr/webapp/build.xml
@@ -40,7 +40,7 @@
   <target name="compile-core"/>
   <target name="compile-test"/>
 
-  <target name="dist"
+  <target name="server-war"
           description="Creates the Solr WAR Distribution file."
           depends="test, init-dist, dist-core, dist-solrj, lucene-jars-to-solr">
     <build-manifest title="Apache Solr Search Server"