diff --git a/VERSION b/VERSION
index 44960c7..0c3a15b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.7.24
+2.7.25
diff --git a/client/nivlheim_client b/client/nivlheim_client
index 9c0fbee..3fc39d2 100755
--- a/client/nivlheim_client
+++ b/client/nivlheim_client
@@ -67,7 +67,7 @@ my $NAME    = 'nivlheim_client';
 my $AUTHOR  = 'Øyvind Hagberg';
 my $CONTACT = 'oyvind.hagberg@usit.uio.no';
 my $RIGHTS  = 'USIT/IT-DRIFT/GD/GID, University of Oslo, Norway';
-my $VERSION = '2.7.24';
+my $VERSION = '2.7.25';
 
 # Usage text
 my $USAGE = <<"END_USAGE";
diff --git a/client/windows/nivlheim_client.ps1 b/client/windows/nivlheim_client.ps1
index a067eed..cbfc7db 100644
--- a/client/windows/nivlheim_client.ps1
+++ b/client/windows/nivlheim_client.ps1
@@ -31,7 +31,7 @@ param(
 	[bool]$nosleep = $false
 )
 
-Set-Variable version -option Constant -value "2.7.24"
+Set-Variable version -option Constant -value "2.7.25"
 Set-Variable useragent -option Constant -value "NivlheimPowershellClient/$version"
 Set-PSDebug -strict
 Set-StrictMode -version "Latest"	# http://technet.microsoft.com/en-us/library/hh849692.aspx
diff --git a/debian/changelog b/debian/changelog
index 6f59b68..c522535 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-nivlheim (2.7.24-1) buster; urgency=low
+nivlheim (2.7.25-1) buster; urgency=low
 
   * Changes in the server code (cgi scripts rewritten in Go)
 
diff --git a/server/service/main.go b/server/service/main.go
index 4ab1f7f..d1b7b8c 100644
--- a/server/service/main.go
+++ b/server/service/main.go
@@ -116,6 +116,16 @@ func main() {
 	// Look for configuration overrides in the environment.
 	UpdateConfigFromEnvironment(config)
 
+	// Create directories if they don't exist
+	err = os.MkdirAll(config.QueueDir,0750)
+	if (err != nil) {
+		log.Print(err)
+	}
+	err = os.MkdirAll(config.UploadDir,0750)
+	if (err != nil) {
+		log.Print(err)
+	}
+
 	// Connect to database
 	var dbConnectionString string
 	if config.PGhost != "" {