diff --git a/LICENSE b/LICENSE
index 4610552..2e40013 100644
--- a/LICENSE
+++ b/LICENSE
@@ -6,6 +6,7 @@ Thanks to 2012 Postmodern <https://github.com/postmodern>
 Thanks to 2013 Bastien Dejean <https://github.com/baskerville>
 Thanks to 2013 Nick Fagerlund <https://github.com/nfagerlund>
 Thanks to 2014 zimbatm <https://github.com/zimbatm>
+Thanks to 2014 Mathias Panzenböck <https://github.com/panzi>
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/README.markdown b/README.markdown
index 3820d1c..e28ca47 100644
--- a/README.markdown
+++ b/README.markdown
@@ -153,7 +153,7 @@ Add this snippet to your gemspec file:
 
     s.files += Dir['man/man?/*.?']            # UNIX man pages
     s.files += Dir['man/**/*.{html,css,js}']  # HTML man pages
-    s.add_development_dependency 'md2man', '~> 3.0'
+    s.add_development_dependency 'md2man', '~> 4.0'
 
 Add this line to your Rakefile:
 
diff --git a/VERSION.markdown b/VERSION.markdown
index 2bf92fc..ed5474f 100644
--- a/VERSION.markdown
+++ b/VERSION.markdown
@@ -1,3 +1,19 @@
+## Version 4.0.0 (2014-10-26)
+
+### Major:
+
+  * Cross references are no longer expanded inside code spans and code blocks.
+
+    Thanks to Mathias Panzenböck for reporting this issue in GH-19:
+    https://github.com/sunaku/md2man/issues/19
+
+  * The `Md2Man::Document` module now defines the following methods.  If you
+    redefine/override these methods in deriving classes, make sure that you
+    call `super()` therein to trigger these methods' original implementation!
+
+    * `Md2Man::Document#block_code(code, language)`
+    * `Md2Man::Document#codespan(code)`
+
 ## Version 3.0.2 (2014-10-26)
 
 ### Patch:
diff --git a/bin/md2man-html b/bin/md2man-html
index 93ba4a6..fdf34d1 100755
--- a/bin/md2man-html
+++ b/bin/md2man-html
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# MD2MAN-HTML 1 2014-10-26 3.0.2
+# MD2MAN-HTML 1 2014-10-26 4.0.0
 
 ## NAME
 
diff --git a/bin/md2man-rake b/bin/md2man-rake
index bfa5f41..a44c21f 100755
--- a/bin/md2man-rake
+++ b/bin/md2man-rake
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# MD2MAN-RAKE 1 2014-10-26 3.0.2
+# MD2MAN-RAKE 1 2014-10-26 4.0.0
 
 ## NAME
 
diff --git a/bin/md2man-roff b/bin/md2man-roff
index fd9c3e4..b0fb161 100755
--- a/bin/md2man-roff
+++ b/bin/md2man-roff
@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 =begin =======================================================================
 
-# MD2MAN-ROFF 1 2014-10-26 3.0.2
+# MD2MAN-ROFF 1 2014-10-26 4.0.0
 
 ## NAME
 
diff --git a/lib/md2man/version.rb b/lib/md2man/version.rb
index 38ff987..9168653 100644
--- a/lib/md2man/version.rb
+++ b/lib/md2man/version.rb
@@ -1,3 +1,3 @@
 module Md2Man
-  VERSION = "3.0.2"
+  VERSION = "4.0.0"
 end
diff --git a/man/man5/md2man.5.markdown b/man/man5/md2man.5.markdown
index 7d3042e..dceb9dc 100644
--- a/man/man5/md2man.5.markdown
+++ b/man/man5/md2man.5.markdown
@@ -1,4 +1,4 @@
-# MD2MAN 5 2014-10-26 3.0.2
+# MD2MAN 5 2014-10-26 4.0.0
 
 ## NAME
 
diff --git a/md2man.gemspec b/md2man.gemspec
index a668517..53e5014 100644
--- a/md2man.gemspec
+++ b/md2man.gemspec
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.files += Dir['man/**/*.{html,css,js}']  # HTML man pages
 
   s.required_ruby_version = '>= 1.9.1'
-  s.add_runtime_dependency 'binman', '~> 3.0'
+  s.add_runtime_dependency 'binman', '~> 4.0'
   s.add_runtime_dependency 'redcarpet', '~> 3.0'
   s.add_development_dependency 'minitest', '~> 5.0'
   s.add_development_dependency 'rake', '~> 10.1'