diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bc8b9d36..9d63f73c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.4.2 (unreleased)
+
+BUG FIXES:
+
+  * provider/aws: fix panic possibility if RDS DB name is empty [GH-1460]
+
 ## 0.4.1 (April 9, 2015)
 
 IMPROVEMENTS:
diff --git a/version.go b/version.go
index c4f705a4a..c6357e0c5 100644
--- a/version.go
+++ b/version.go
@@ -4,9 +4,9 @@ package main
 var GitCommit string
 
 // The main version number that is being run at the moment.
-const Version = "0.4.1"
+const Version = "0.4.2"
 
 // A pre-release marker for the version. If this is "" (empty string)
 // then it means that it is a final release. Otherwise, this is a pre-release
 // such as "dev" (in development), "beta", "rc1", etc.
-const VersionPrerelease = ""
+const VersionPrerelease = "dev"