Index: trunk/build.xml
===================================================================
--- trunk/build.xml	(revision 12715)
+++ trunk/build.xml	(revision 12801)
@@ -48,5 +48,5 @@
             <pathelement path="${dist.jar}"/>
             <pathelement path="${groovy.jar}"/>
-            <pathelement path="tools/findbugs/annotations.jar"/>
+            <pathelement path="tools/spotbugs/spotbugs-annotations.jar"/>
         </path>
         <path id="pmd.classpath">
@@ -714,5 +714,5 @@
         <sequential>
             <echo message="Generating Taginfo for type @{type} to @{output}"/>
-            <groovy src="${taginfoextract}" classpath="${dist.jar}:tools/findbugs/annotations.jar">
+            <groovy src="${taginfoextract}" classpath="${dist.jar}:tools/spotbugs/spotbugs-annotations.jar">
                 <arg value="-t"/>
                 <arg value="@{type}"/>
@@ -790,17 +790,17 @@
     </target>
 
-    <target name="findbugs" depends="dist">
-        <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="tools/findbugs/findbugs-ant.jar"/>
-        <path id="findbugs-classpath">
-            <fileset dir="${base.dir}/tools/findbugs/">
+    <target name="spotbugs" depends="dist">
+        <taskdef name="spotbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpath="tools/spotbugs/spotbugs-ant.jar"/>
+        <path id="spotbugs-classpath">
+            <fileset dir="${base.dir}/tools/spotbugs/">
                 <include name="*.jar"/>
             </fileset>
         </path>
-        <property name="findbugs-classpath" refid="findbugs-classpath"/>
-        <findbugs output="xml"
-                outputFile="findbugs-josm.xml"
-                classpath="${findbugs-classpath}"
+        <property name="spotbugs-classpath" refid="spotbugs-classpath"/>
+        <spotbugs output="xml"
+                outputFile="spotbugs-josm.xml"
+                classpath="${spotbugs-classpath}"
                 pluginList=""
-                excludeFilter="tools/findbugs/josm-filter.xml"
+                excludeFilter="tools/spotbugs/josm-filter.xml"
                 effort="max"
                 reportLevel="low"
@@ -808,5 +808,5 @@
             <sourcePath path="${base.dir}/src" />
             <class location="${dist.jar}" />
-        </findbugs>
+        </spotbugs>
     </target>