diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23a30b72771b4a73e0ee5b04cce067e62878fa7d..c92770867aa4ef2c9296db0827daf5c2618857e0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,10 @@
 Upcoming version:
 -----------------
+  - activating database logging in testcase now (not globally anymore) (Nikolaus Krismer)
   - updating gradle scmversion plugin (Nikolaus Krismer)
   - added contribution guidelines (Nikolaus Krismer)
   - moving gradle changelog tasks to separate buildscript (Nikolaus Krismer)
-
-Version v0.5.1:
----------------
   - fixing problems in changelog generation (again) (Nikolaus Krismer)
-  - Merge branch 'master' of git@dbis-git.uibk.ac.at:krismer/isochrone-vm.git (Nikolaus Krismer)
   - calling grgit add before grgit commit (by now push is empty) (Nikolaus Krismer)
   - not commiting changelogs in jenkins without changes :-) (Nikolaus Krismer)
   - improving gradle changelog mechanism (excluding jenkins commits) (Nikolaus Krismer)
@@ -18,6 +15,9 @@ Version v0.5.1:
   - fixing problems with gradle's clean task (Nikolaus Krismer)
   - fixing invalid clean task definition (Nikolaus Krismer)
   - adding removal of CHANGELOG to clean task (Nikolaus Krismer)
+
+Version v0.5.1:
+---------------
   - removed hard-coded version from gradle (is set using scmversion plugin) (Nikolaus Krismer)
   - added density generation for synthethic networks (Nikolaus Krismer)
   - removed pgRouting / osm2pgrouting from files (not needed and never used) (Nikolaus Krismer)
@@ -42,7 +42,6 @@ Version v0.5.0:
   - geoserver version update (Nikolaus Krismer)
   - always adding pg_procedures to created database (not only when postgis is installed) (Nikolaus Krismer)
   - added installation of phpLiteAdmin and spatialite (Nikolaus Krismer)
-  - Merge branch 'master' of git@dbis-git.uibk.ac.at:krismer/isochrone-vm.git (Nikolaus Krismer)
   - source profile in init script so it works without problems in centos 6 with the service command (Nikolaus Krismer)
   - Fixed tomcat startup message (root)
   - creating directories needed by script at the beginning (Nikolaus Krismer)
diff --git a/Vagrantfile b/Vagrantfile
index 40313a8c3224e179ee8664581170e89066ae84bf..7b3cf6bf01fdb94dbc2ed27d430d66a2ed5f9b84 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -66,7 +66,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.provision "shell", path: "bootstrap/prepareEnvironment.sh", args: ["secretPhdPassword#2014!", (isLocalMode ? "true" : "false")]
   config.vm.provision "shell", path: "bootstrap/createDatabase.sh", args: ["niko", "secretPhdPassword#2014!"]
   config.vm.provision "shell", path: "bootstrap/importData.sh", args: ["niko", "secretPhdPassword#2014!", (isLocalMode ? "true" : "false")]
-  config.vm.provision "shell", path: "bootstrap/activateDatabaseLogging.sh"
+  # Optionally activate database logging (for queryTimeLogging this is done in the testcase itself now)
+  #config.vm.provision "shell", path: "bootstrap/activateDatabaseLogging.sh"
 
   # Network configuration
   config.vm.network :forwarded_port, guest: 5432, host: 5432, id: "postgresql", auto_correct: false