diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc
index c368f8eaaf..43238ba45a 100644
--- a/libs/ardour/directory_names.cc
+++ b/libs/ardour/directory_names.cc
@@ -40,7 +40,7 @@ const char* const ladspa_dir_name = X_("ladspa");
 const char* const panner_dir_name = X_("panners");
 const char* const backend_dir_name = X_("backends");
 
-char config_dir_name[] = X_(PROGRAM_NAME "3");
+char config_dir_name[] = X_(PROGRAM_NAME PROGRAM_VERSION);
 #if defined (__APPLE__) || defined (PLATFORM_WINDOWS)
 const char* const user_config_dir_name = config_dir_name;
 #else
diff --git a/wscript b/wscript
index f217c64085..68054f54d3 100644
--- a/wscript
+++ b/wscript
@@ -48,7 +48,7 @@ V = MAJOR + '.' + MINOR + '.' + MICRO
 # because if it is, it breaks waf somehow.
 #
 VERSION = V.encode ('ascii', 'ignore')
-APPNAME = 'Ardour' + MAJOR
+PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore')
 
 # Mandatory variables
 top = '.'
@@ -380,6 +380,7 @@ def set_compiler_flags (conf,opt):
         compiler_flags.append('-DENABLE_NLS')
 
     compiler_flags.append ('-DPROGRAM_NAME="' + Options.options.program_name + '"')
+    compiler_flags.append ('-DPROGRAM_VERSION="' + PROGRAM_VERSION + '"')
 
     if opt.debug:
         conf.env.append_value('CFLAGS', debug_flags)