diff --git a/cli-miner.cpp b/cli-miner.cpp
index 5ef172b..a4c509b 100644
--- a/cli-miner.cpp
+++ b/cli-miner.cpp
@@ -26,6 +26,7 @@
 #include "jconf.h"
 #include "console.h"
 #include "donate-level.h"
+#include "version.h"
 
 #ifndef CONF_NO_HTTPD
 #	include "httpd.h"
@@ -124,7 +125,7 @@ int main(int argc, char *argv[])
 #endif
 
 	printer::inst()->print_str("-------------------------------------------------------------------\n");
-	printer::inst()->print_str("XMR-Stak-AMD mining software, AMD Version.\n");
+	printer::inst()->print_str( XMR_STAK_NAME" " XMR_STAK_VERSION " mining software, AMD Version.\n");
 	printer::inst()->print_str("AMD mining code was written by wolf9466.\n");
 	printer::inst()->print_str("Brought to you by fireice_uk under GPLv3.\n\n");
 	char buffer[64];
diff --git a/jpsock.cpp b/jpsock.cpp
index 70241f9..26af165 100644
--- a/jpsock.cpp
+++ b/jpsock.cpp
@@ -32,8 +32,9 @@
 #include "jext.h"
 #include "socks.h"
 #include "socket.h"
+#include "version.h"
 
-#define AGENTID_STR "xmr-stak-amd/1.3.1"
+#define AGENTID_STR XMR_STAK_NAME "/" XMR_STAK_VERSION
 
 using namespace rapidjson;
 
diff --git a/version.h b/version.h
new file mode 100644
index 0000000..b1d415d
--- /dev/null
+++ b/version.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define XMR_STAK_NAME "xmr-stak-amd"
+#define XMR_STAK_VERSION "1.3.1-dev"