Index: /applications/viewer/jmapviewer/Readme.txt
===================================================================
--- /applications/viewer/jmapviewer/Readme.txt	(revision 33804)
+++ /applications/viewer/jmapviewer/Readme.txt	(revision 33805)
@@ -20,4 +20,5 @@
 (c) 2013, Galo Higueras
 (c) 2015-2016, Wiktor Niesiobędzki
+(c) 2017, Robert Scott
 
 This work bases partly on the JOSM plugin "Slippy Map Chooser" by Tim Haussmann
Index: /applications/viewer/jmapviewer/build.xml
===================================================================
--- /applications/viewer/jmapviewer/build.xml	(revision 33804)
+++ /applications/viewer/jmapviewer/build.xml	(revision 33805)
@@ -2,5 +2,5 @@
 <project default="all" name="Compile and build java classes plus jar archives">
 
-	<target name="all" depends="clean,build,svn_info,pack,create_run_jar,findbugs,checkstyle,javadoc,create_release_zip,create_source_release_zip" />
+	<target name="all" depends="clean,build,svn_info,pack,create_run_jar,spotbugs,checkstyle,javadoc,create_release_zip,create_source_release_zip" />
 
 	<target name="clean">
@@ -85,21 +85,21 @@
     </target>
 
-    <target name="findbugs" depends="pack">
-        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" 
-        	classpath="tools/findbugs/findbugs-ant.jar"/>
-        <path id="findbugs-classpath">
-            <fileset dir="tools/findbugs/">
+    <target name="spotbugs" depends="pack">
+        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" 
+        	classpath="tools/spotbugs/spotbugs-ant.jar"/>
+        <path id="spotbugs-classpath">
+            <fileset dir="tools/spotbugs/">
                 <include name="*.jar"/>
             </fileset>
         </path>
-        <property name="findbugs-classpath" refid="findbugs-classpath"/>
-        <findbugs output="xml"
-                outputFile="findbugs-jmapviewer.xml"
-                classpath="${findbugs-classpath}"
+        <property name="spotbugs-classpath" refid="spotbugs-classpath"/>
+        <spotbugs output="xml"
+                outputFile="spotbugs-jmapviewer.xml"
+                classpath="${spotbugs-classpath}"
                 effort="max"
                 >
             <sourcePath path="${basedir}/src" />
             <class location="JMapViewer.jar" />
-        </findbugs>
+        </spotbugs>
     </target>