diff --git a/Library/Formula/gbdfed.rb b/Library/Formula/gbdfed.rb
index eef6b7f4ee88..6c666444bcf0 100644
--- a/Library/Formula/gbdfed.rb
+++ b/Library/Formula/gbdfed.rb
@@ -1,21 +1,27 @@
-require 'formula'
-
 class Gbdfed < Formula
   desc "Bitmap Font Editor"
-  homepage 'http://sofia.nmsu.edu/~mleisher/Software/gbdfed/'
-  url 'http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-1.6.tar.gz'
-  sha1 '733afccc43273d3385f8b9bc9d6334bcaa4403ae'
+  homepage "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"
+  url "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-1.6.tar.gz"
+  sha256 "8042575d23a55a3c38192e67fcb5eafd8f7aa8d723012c374acb2e0a36022943"
+  revision 1
 
-  depends_on 'pkg-config' => :build
-  depends_on 'gtk+'
+  depends_on "pkg-config" => :build
+  depends_on "gtk+"
 
   # Fixes compilation error with gtk+ per note on the project homepage.
   patch :DATA
 
   def install
+    # BDF_NO_X11 has to be defined to avoid X11 headers from being included
+    ENV["CPPFLAGS"] = "-DBDF_NO_X11"
     system "./configure", "--disable-debug", "--disable-dependency-tracking",
-                          "--prefix=#{prefix}"
-    system "make install"
+                          "--prefix=#{prefix}", "--without-x"
+    system "make", "install"
+  end
+
+  test do
+    assert (bin/"gbdfed").exist?
+    assert (share/"man/man1/gbdfed.1").exist?
   end
 end