diff --git a/Makefile b/Makefile
index 07e8b7bc..b6e6faa5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 APP=pybitmessage
-VERSION=0.3.5
+VERSION=0.4.0
 RELEASE=1
 ARCH_TYPE=`uname -m`
 PREFIX?=/usr/local
diff --git a/arch.sh b/arch.sh
index 795ec69d..42daefdc 100755
--- a/arch.sh
+++ b/arch.sh
@@ -2,8 +2,8 @@
 
 GIT_APP=PyBitmessage
 APP=pybitmessage
-PREV_VERSION=0.3.5
-VERSION=0.3.5
+PREV_VERSION=0.4.0
+VERSION=0.4.0
 RELEASE=1
 ARCH_TYPE=any
 CURRDIR=`pwd`
diff --git a/archpackage/PKGBUILD b/archpackage/PKGBUILD
index fd13b92a..455180c3 100644
--- a/archpackage/PKGBUILD
+++ b/archpackage/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Bob Mottram (4096 bits) <bob@robotics.uk.to>
 pkgname=pybitmessage
-pkgver=0.3.5
+pkgver=0.4.0
 pkgrel=1
 pkgdesc="Bitmessage is a P2P communications protocol used to send encrypted messages to another person or to many subscribers. It is decentralized and trustless, meaning that you need-not inherently trust any entities like root certificate authorities. It uses strong authentication which means that the sender of a message cannot be spoofed, and it aims to hide "non-content" data, like the sender and receiver of messages, from passive eavesdroppers like those running warrantless wiretapping programs."
 arch=('any')
diff --git a/debian.sh b/debian.sh
index ea46acaf..b8fa4cf6 100755
--- a/debian.sh
+++ b/debian.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.3.5
-VERSION=0.3.5
+PREV_VERSION=0.4.0
+VERSION=0.4.0
 RELEASE=1
 ARCH_TYPE=all
 DIR=${APP}-${VERSION}
diff --git a/ebuild.sh b/ebuild.sh
index ed7f1903..c13186e4 100755
--- a/ebuild.sh
+++ b/ebuild.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.3.5
-VERSION=0.3.5
+PREV_VERSION=0.4.0
+VERSION=0.4.0
 RELEASE=1
 SOURCEDIR=.
 ARCH_TYPE=`uname -m`
diff --git a/generate.sh b/generate.sh
index 4154fff7..376c1926 100755
--- a/generate.sh
+++ b/generate.sh
@@ -4,7 +4,7 @@
 
 rm -f Makefile rpmpackage/*.spec
 
-packagemonkey -n "PyBitmessage" --version "0.3.5" --dir "." -l "mit" \
+packagemonkey -n "PyBitmessage" --version "0.4.0" --dir "." -l "mit" \
     -e "Bob Mottram (4096 bits) <bob@robotics.uk.to>" \
     --brief "Send encrypted messages" \
     --desc "Bitmessage is a P2P communications protocol used to send " \
diff --git a/puppy.sh b/puppy.sh
index 5f2fcae0..b9e30c04 100755
--- a/puppy.sh
+++ b/puppy.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.3.5
-VERSION=0.3.5
+PREV_VERSION=0.4.0
+VERSION=0.4.0
 RELEASE=1
 BUILDDIR=~/petbuild
 CURRDIR=`pwd`
diff --git a/rpm.sh b/rpm.sh
index 09064280..893cae97 100755
--- a/rpm.sh
+++ b/rpm.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.3.5
-VERSION=0.3.5
+PREV_VERSION=0.4.0
+VERSION=0.4.0
 RELEASE=1
 SOURCEDIR=.
 ARCH_TYPE=`uname -m`
diff --git a/rpmpackage/pybitmessage.spec b/rpmpackage/pybitmessage.spec
index 3af43532..00012be9 100644
--- a/rpmpackage/pybitmessage.spec
+++ b/rpmpackage/pybitmessage.spec
@@ -1,5 +1,5 @@
 Name: pybitmessage
-Version: 0.3.5
+Version: 0.4.0
 Release: 1%{?dist}
 Summary: Send encrypted messages
 License: MIT
diff --git a/slack.sh b/slack.sh
index 112488c0..07987fc2 100755
--- a/slack.sh
+++ b/slack.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 APP=pybitmessage
-PREV_VERSION=0.3.5
-VERSION=0.3.5
+PREV_VERSION=0.4.0
+VERSION=0.4.0
 RELEASE=1
 ARCH_TYPE=`uname -m`
 BUILDDIR=~/slackbuild
diff --git a/src/build_osx.py b/src/build_osx.py
index de7dc851..f9ab2c03 100644
--- a/src/build_osx.py
+++ b/src/build_osx.py
@@ -1,7 +1,7 @@
 from setuptools import setup
 
 name = "Bitmessage"
-version = "0.3.5"
+version = "0.4.0"
 mainscript = ["bitmessagemain.py"]
 
 setup(
diff --git a/src/shared.py b/src/shared.py
index 948f3d87..1b67fef9 100644
--- a/src/shared.py
+++ b/src/shared.py
@@ -1,4 +1,4 @@
-softwareVersion = '0.3.5'
+softwareVersion = '0.4.0'
 verbose = 1
 maximumAgeOfAnObjectThatIAmWillingToAccept = 216000  # Equals two days and 12 hours.
 lengthOfTimeToLeaveObjectsInInventory = 237600  # Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice.