diff --git a/dhcp-errwarn-message.patch b/dhcp-errwarn-message.patch
index a65c2c2..f42d1e9 100644
--- a/dhcp-errwarn-message.patch
+++ b/dhcp-errwarn-message.patch
@@ -1,7 +1,49 @@
-diff -up dhcp-4.3.0b1/omapip/errwarn.c.errwarn dhcp-4.3.0b1/omapip/errwarn.c
---- dhcp-4.3.0b1/omapip/errwarn.c.errwarn	2014-01-21 09:31:47.301334249 +0100
-+++ dhcp-4.3.0b1/omapip/errwarn.c	2014-01-21 09:33:20.569039072 +0100
-@@ -76,11 +76,13 @@ void log_fatal (const char * fmt, ... )
+diff -up dhcp-4.3.5/omapip/errwarn.c.errwarn dhcp-4.3.5/omapip/errwarn.c
+--- dhcp-4.3.5/omapip/errwarn.c.errwarn	2016-09-27 21:16:50.000000000 +0200
++++ dhcp-4.3.5/omapip/errwarn.c	2016-11-29 19:44:03.515031147 +0100
+@@ -49,6 +49,41 @@ void (*log_cleanup) (void);
+ static char mbuf [CVT_BUF_MAX + 1];
+ static char fbuf [CVT_BUF_MAX + 1];
+ 
++// get BUG_REPORT_URL from /etc/os-release
++char * bug_report_url(void) {
++    FILE * file = fopen("/etc/os-release", "r");
++    size_t len;
++    char * line = NULL;
++    char * url = NULL;
++    size_t url_len = 256;
++
++    url = (char *) malloc(url_len * sizeof(char));
++    strcpy(url, "https://bugzilla.redhat.com/");
++
++    if (!file)
++        return url;
++
++    while ((getline(&line, &len, file)) != -1) {
++        if (strstr(line, "BUG_REPORT_URL") != NULL) {
++            char * start = strchr(line, '=');
++            char * rquotes = strrchr(line, '"');
++
++            if (rquotes != NULL) {
++                *rquotes = '\0';
++                strncpy(url, start+2, url_len);
++            } else {
++                strncpy(url, start+1, url_len);
++            }
++            url[url_len-1] = '\0';
++            fclose(file);
++            return url;
++        }
++    }
++    fclose(file);
++    return url;
++}
++
++
+ /* Log an error message, then exit... */
+ 
+ void log_fatal (const char * fmt, ... )
+@@ -75,11 +110,13 @@ void log_fatal (const char * fmt, ... )
    }
  
    log_error ("%s", "");
@@ -11,12 +53,12 @@ diff -up dhcp-4.3.0b1/omapip/errwarn.c.errwarn dhcp-4.3.0b1/omapip/errwarn.c
 -  log_error ("before submitting a bug.  These pages explain the proper");
 -  log_error ("process and the information we find helpful for debugging..");
 +  log_error ("This version of ISC DHCP is based on the release available");
-+  log_error ("on ftp.isc.org.  Features have been added and other changes");
++  log_error ("on ftp.isc.org. Features have been added and other changes");
 +  log_error ("have been made to the base software release in order to make");
 +  log_error ("it work better with this distribution.");
 +  log_error ("%s", "");
-+  log_error ("Please report for this software via the Red Hat Bugzilla site:");
-+  log_error ("    http://bugzilla.redhat.com");
++  log_error ("Please report issues with this software via: ");
++  log_error ("%s", bug_report_url());
    log_error ("%s", "");
    log_error ("exiting.");
  
diff --git a/dhcp.spec b/dhcp.spec
index 6d1ee66..40e3d4c 100644
--- a/dhcp.spec
+++ b/dhcp.spec
@@ -19,7 +19,7 @@
 Summary:  Dynamic host configuration protocol software
 Name:     dhcp
 Version:  4.3.5
-Release:  1%{?dist}
+Release:  2%{?dist}
 # NEVER CHANGE THE EPOCH on this package.  The previous maintainer (prior to
 # dcantrell maintaining the package) made incorrect use of the epoch and
 # that's why it is at 12 now.  It should have never been used, but it was.
@@ -662,6 +662,9 @@ done
 %doc doc/html/
 
 %changelog
+* Wed Nov 30 2016 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.5-2
+- get BUG_REPORT_URL from /etc/os-release (#1399351)
+
 * Wed Oct 05 2016 Jiri Popelka <jpopelka@redhat.com> - 12:4.3.5-1
 - 4.3.5