Index: applications/editors/josm/plugins/build-common.xml
===================================================================
--- applications/editors/josm/plugins/build-common.xml	(revision 33589)
+++ applications/editors/josm/plugins/build-common.xml	(revision 33591)
@@ -18,6 +18,6 @@
     <property name="checkstyle.jar"         location="../00_core_tools/checkstyle/checkstyle-all.jar"/>
     <property name="checkstyle-build.dir"   location="../00_core_tools/checkstyle/build"/>
-    <property name="findbugs-ant.jar"       location="../00_core_tools/findbugs/findbugs-ant.jar"/>
-    <property name="annotations.jar"        location="../00_core_tools/findbugs/annotations.jar"/>
+    <property name="spotbugs-ant.jar"       location="../00_core_tools/spotbugs/spotbugs-ant.jar"/>
+    <property name="annotations.jar"        location="../00_core_tools/spotbugs/spotbugs-annotations.jar"/>
     <property name="plugin.build.dir"       location="build"/>
     <property name="plugin.test.dir"        location="test"/>
@@ -548,17 +548,17 @@
     </target>
 
-    <target name="findbugs" depends="dist">
-        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${findbugs-ant.jar}"/>
-        <path id="findbugs-classpath">
-            <fileset dir="../00_core_tools/findbugs/">
+    <target name="spotbugs" depends="dist">
+        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="${spotbugs-ant.jar}"/>
+        <path id="spotbugs-classpath">
+            <fileset dir="../00_core_tools/spotbugs/">
                 <include name="*.jar"/>
             </fileset>
         </path>
-        <property name="findbugs-classpath" refid="findbugs-classpath"/>
-        <findbugs output="xml"
-                outputFile="findbugs-josm-${ant.project.name}.xml"
-                classpath="${findbugs-classpath}"
+        <property name="spotbugs-classpath" refid="spotbugs-classpath"/>
+        <spotbugs output="xml"
+                outputFile="spotbugs-josm-${ant.project.name}.xml"
+                classpath="${spotbugs-classpath}"
                 pluginList=""
-                excludeFilter="../findbugs-filter.xml"
+                excludeFilter="../spotbugs-filter.xml"
                 effort="default"
                 reportLevel="low"
@@ -567,5 +567,5 @@
             <sourcePath path="${basedir}/src" />
             <class location="${plugin.jar}" />
-        </findbugs>
+        </spotbugs>
     </target>