diff --git a/.gitattributes b/.gitattributes
index e77e6900..27dc5b03 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,22 +1,8 @@
 # Always use Unix convention for new lines
 * text eol=lf
 
-# Custom for Visual Studio
-*.cs     diff=csharp
-*.sln    merge=union
-*.csproj merge=union
-*.vbproj merge=union
-*.fsproj merge=union
-*.dbproj merge=union
-
-# Standard to msysgit
-*.doc	 diff=astextplain
-*.DOC	 diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot  diff=astextplain
-*.DOT  diff=astextplain
-*.pdf  diff=astextplain
-*.PDF	 diff=astextplain
-*.rtf	 diff=astextplain
-*.RTF	 diff=astextplain
+# These files are binary and should be left untouched
+# (binary is a macro for -text -diff)
+*.jar	binary
+*.pdf	binary
+*.PDF	binary
\ No newline at end of file
diff --git a/jhove/bin/JhoveApp.jar b/jhove/bin/JhoveApp.jar
index b84c5671..ec4ac855 100644
Binary files a/jhove/bin/JhoveApp.jar and b/jhove/bin/JhoveApp.jar differ
diff --git a/jhove/bin/JhoveView.jar b/jhove/bin/JhoveView.jar
index 8ed7ca10..6ad2e0dd 100644
Binary files a/jhove/bin/JhoveView.jar and b/jhove/bin/JhoveView.jar differ
diff --git a/jhove/bin/jhove-module.jar b/jhove/bin/jhove-module.jar
index c1e59778..ed5730df 100644
Binary files a/jhove/bin/jhove-module.jar and b/jhove/bin/jhove-module.jar differ
diff --git a/jhove/bin/jhove.jar b/jhove/bin/jhove.jar
index 77fea60d..231fd1ab 100644
Binary files a/jhove/bin/jhove.jar and b/jhove/bin/jhove.jar differ
diff --git a/jhove/conf/jhove.conf.old b/jhove/conf/jhove.conf.old
deleted file mode 100644
index 9481d6e0..00000000
--- a/jhove/conf/jhove.conf.old
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jhoveConfig version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://hul.harvard.edu/ois/xml/ns/jhove/jhoveConfig"
- xsi:schemaLocation="http://hul.harvard.edu/ois/xml/ns/jhove/jhoveConfig
-                     http://hul.harvard.edu/ois/xml/xsd/jhove/1.4/jhoveConfig.xsd">
- <jhoveHome>/users/stephen/projects/jhove</jhoveHome>
- <defaultEncoding>utf-8</defaultEncoding>
- <tempDirectory>/var/tmp</tempDirectory>
- <bufferSize>131072</bufferSize>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.AiffModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.WaveModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.PdfModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.Jpeg2000Module</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.JpegModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.GifModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.TiffModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.XmlModule</class>
-  <param>schema=http://www.example.com/schema;/home/schemas/exampleschema.xsd</param>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.HtmlModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.AsciiModule</class>
- </module>
- <module>
-  <class>edu.harvard.hul.ois.jhove.module.Utf8Module</class>
- </module>
-</jhoveConfig>