diff --git a/Makefile.in b/Makefile.in
index 3132a11b2..7ac5ae509 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,8 +1,6 @@
 # Extract the version string from nmap.h.
 export NMAP_VERSION := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_VERSION' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
 export NMAP_UPDATE_CHANNEL := $(shell grep '^\#[ \t]*define[ \t]\+NMAP_UPDATE_CHANNEL' nmap.h | sed -e 's/.*"\(.*\)".*/\1/' -e 'q')
-NMAP_NAME= Nmap
-NMAP_URL= https://nmap.org
 NMAP_PLATFORM=@host@
 datarootdir = @datarootdir@
 prefix = @prefix@
@@ -37,7 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@
 NDIFFDIR = @NDIFFDIR@
 NPINGDIR = @NPINGDIR@
 PYTHON = @PYTHON@
-DEFS = @DEFS@ -DNMAP_NAME=\"$(NMAP_NAME)\" -DNMAP_URL=\"$(NMAP_URL)\" -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
+DEFS = @DEFS@ -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\"
 # With GCC, add extra security checks to source code.
 # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html
 # Level 1 only makes changes that don't affect "conforming" programs,
diff --git a/nmap.h b/nmap.h
index 50ee6f93e..ffe3b0c7b 100644
--- a/nmap.h
+++ b/nmap.h
@@ -183,6 +183,15 @@
 
 /*******  DEFINES  ************/
 
+#ifdef NMAP_OEM
+#include "../nmap-build/nmap-oem.h"
+#endif
+
+#ifndef NMAP_NAME
+#define NMAP_NAME "Nmap"
+#endif
+#define NMAP_URL "https://nmap.org"
+
 #ifndef NMAP_VERSION
 /* Edit this definition only within the quotes, because it is read from this
    file by the makefiles. */
diff --git a/nmap_winconfig.h b/nmap_winconfig.h
index de0e48e51..2dcef6403 100644
--- a/nmap_winconfig.h
+++ b/nmap_winconfig.h
@@ -137,8 +137,6 @@
 /* Without this, Windows will give us all sorts of crap about using functions
    like strcpy() even if they are done safely */
 #define _CRT_SECURE_NO_DEPRECATE 1
-#define NMAP_NAME "Nmap"
-#define NMAP_URL "https://nmap.org"
 #define NMAP_PLATFORM "i686-pc-windows-windows"
 #define NMAPDATADIR "c:\\nmap" /* FIXME: I really need to make this dynamic */
 
diff --git a/zenmap/zenmapCore/Name.py b/zenmap/zenmapCore/Name.py
index 35d0deca8..beeb9e5f8 100644
--- a/zenmap/zenmapCore/Name.py
+++ b/zenmap/zenmapCore/Name.py
@@ -135,7 +135,7 @@ APP_DISPLAY_NAME = "Zenmap"
 APP_WEB_SITE = "https://nmap.org/zenmap"
 APP_DOWNLOAD_SITE = "https://nmap.org/download.html"
 APP_DOCUMENTATION_SITE = "https://nmap.org/docs.html"
-APP_COPYRIGHT = "Copyright 2005-2018 Insecure.Com LLC"
+APP_COPYRIGHT = "Copyright 2005-2019 Insecure.Com LLC"
 
 NMAP_DISPLAY_NAME = u"Nmap"
 NMAP_WEB_SITE = "https://nmap.org"