diff --git a/CHANGELOG b/CHANGELOG
index 32fbcabade..1ff4880d80 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,5 @@
-git-annex (6.20171215) UNRELEASED; urgency=medium
+git-annex (6.20180112) upstream; urgency=medium
 
-  * Removed the testsuite build flag; test suite is always included.
   * Added inprogress command for accessing files as they are being
     downloaded.
   * Fix bug introduced in version 6.20171018 that caused some commands
@@ -10,7 +9,6 @@ git-annex (6.20171215) UNRELEASED; urgency=medium
     nothing, like it used to when quvi was used.
   * addurl: Fix encoding of filename queried from youtube-dl when in
     --fast mode.
-  * git-annex.cabal: Add back custom-setup stanza, so cabal new-build works.
   * Fix several places where files in .git/annex/ were written with modes
     that did not take the core.sharedRepository config into account.
   * Improve startup time for commands that do not operate on remotes,
@@ -20,8 +18,11 @@ git-annex (6.20171215) UNRELEASED; urgency=medium
     to disable the default checking of the uuid of remotes that point to
     directories. This can be useful to avoid unncessary drive spin-ups and
     automounting.
+  * git-annex.cabal: Add back custom-setup stanza, so cabal new-build works.
+  * git-annex.cabal: Removed the testsuite build flag; test suite is always
+    included.
 
- -- Joey Hess <id@joeyh.name>  Wed, 20 Dec 2017 12:11:46 -0400
+ -- Joey Hess <id@joeyh.name>  Fri, 12 Jan 2018 15:45:48 -0400
 
 git-annex (6.20171214) upstream; urgency=medium
 
diff --git a/COPYRIGHT b/COPYRIGHT
index d7a18819f9..4ac78af95a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -2,7 +2,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Source: native package
 
 Files: *
-Copyright: © 2010-2017 Joey Hess <id@joeyh.name>
+Copyright: © 2010-2018 Joey Hess <id@joeyh.name>
 License: GPL-3+
 
 Files: Assistant/WebApp.hs Assistant/WebApp/* templates/* static/*
@@ -21,7 +21,7 @@ Copyright: 2011 Bas van Dijk & Roel van Dijk
 License: BSD-2-clause
 
 Files: Utility/*
-Copyright: 2012-2017 Joey Hess <id@joeyh.name>
+Copyright: 2012-2018 Joey Hess <id@joeyh.name>
 License: BSD-2-clause
 
 Files: doc/logo* */favicon.ico standalone/osx/git-annex.app/Contents/Resources/git-annex.icns standalone/android/icons/*
diff --git a/git-annex.cabal b/git-annex.cabal
index 0053a63e5e..5c03fac52b 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -1,5 +1,5 @@
 Name: git-annex
-Version: 6.20171214
+Version: 6.20180112
 Cabal-Version: >= 1.8
 License: GPL-3
 Maintainer: Joey Hess <id@joeyh.name>