diff --git a/Changelog.md b/Changelog.md
index f189761..02d7990 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,30 @@
 # Changelog
 
+## 15.4.0
+
+### New
+
+* Enable smtp notify service. [Thomas Merkel]
+* Add bashrc for root user from default. [Thomas Merkel]
+* Add gsed as default package to base. [Thomas Merkel]
+
+### Fix
+
+* Find issue with crt lookup. [Thomas Merkel]
+* Store FQDN for nullmailer in me file. [Thomas Merkel]
+
+### Other
+
+* Provide SVC log functions from global zone to zones. [Thomas Merkel]
+
+  The functions help a lot for debugging and you don't need to know
+  the full command :-)
+
+* Use FQDN for PS1. [Thomas Merkel]
+
+  We use a cloud based environment, so most of the time some servers have the
+  same name but different FQDN.
+
 # 15.3.0
 
 ### New
diff --git a/LICENSE b/LICENSE
index 6227930..7315569 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015 SkyLime GmbH, All rights reserved.
+Copyright (c) 2016 SkyLime GmbH, All rights reserved.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/customize b/customize
index 4177ba1..579bf3e 100755
--- a/customize
+++ b/customize
@@ -4,7 +4,7 @@ set -o errexit
 
 PATH=/opt/local/gnu/bin:/opt/local/bin:/opt/local/sbin:/usr/bin:/usr/sbin
 
-PKGSRC_VERSION='2015Q3'
+PKGSRC_VERSION='2015Q4'
 
 # Munin plugins
 MUNIN_PLUGIN_VERSION='0.7'
diff --git a/manifest b/manifest
index 624e680..fbac777 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 name="core-base"
 organization="SkyLime"
 brand="Instance"
-version="15.3.0"
+version="15.4.0"
 description="Base core.io image"
 homepage="https://github.com/skylime/mi-core-base"
 users="root admin"
-base="fec7e254-6e98-11e5-9284-3f9c607cb3e7"
+base="c540b62c-beb2-11e5-8512-8b1694a57f84"
diff --git a/manifest.json b/manifest.json
index 4549b75..172dd6c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,11 +1,11 @@
 {
 	"name":         "core-base",
-	"version":      "15.3.0",
+	"version":      "15.4.0",
 	"description":  "Base core.io image",
 	"organization": "SkyLime",
 	"brand":        "Instance",
 	"homepage":     "https://github.com/skylime/mi-core-base",
-	"base":         "fec7e254-6e98-11e5-9284-3f9c607cb3e7",
+	"base":         "c540b62c-beb2-11e5-8512-8b1694a57f84",
 	"customer_metadata": {
 		"root_authorized_keys": {"type": "text", "description": "SSH public authorized key(s) for the root user"},
 		"root_ssh_rsa":         {"type": "text", "description": "private SSH rsa key for root user"},