--- a/ChangeLog	Thu Oct 09 00:55:41 2014 +0100
+++ b/ChangeLog	Thu Oct 09 01:32:24 2014 +0100
@@ -1,3 +1,11 @@
+2014-10-09  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* Makefile.am:
+	(ICEDTEA_PATCHES): Add new patch.
+	* NEWS: Updated.
+	* patches/pr1904-icedtea_and_distro_versioning.patch:
+	Backport of versioning fix from IcedTea 2.x.
+
 2014-10-08  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* Makefile.am:

--- a/Makefile.am	Thu Oct 09 00:55:41 2014 +0100
+++ b/Makefile.am	Thu Oct 09 01:32:24 2014 +0100
@@ -626,7 +626,8 @@
 	patches/openjdk/7033170-getmaxallowedkeylength_throws_exception.patch \
 	patches/openjdk/7044060-support_nsa_suite_b.patch \
 	patches/openjdk/8006935-long_keys_in_hmac_prf.patch \
-	patches/openjdk/7106773-512_bits_rsa.patch
+	patches/openjdk/7106773-512_bits_rsa.patch \
+	patches/pr1904-icedtea_and_distro_versioning.patch
 
 # Temporarily disabled as causes crashes
 #	patches/openjdk/7122142-annotation_race_condition.patch

--- a/NEWS	Thu Oct 09 00:55:41 2014 +0100
+++ b/NEWS	Thu Oct 09 01:32:24 2014 +0100
@@ -35,6 +35,7 @@
   - OJ39: Handle fonts with the non-canonical processing flag set
 * Bug fixes
   - PR1886: IcedTea does not checksum supplied tarballs
+  - PR1904: [REGRESSION] Bug reports now lack IcedTea version & distribution packaging information
 
 New in release 1.13.4 (2014-07-15):
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/pr1904-icedtea_and_distro_versioning.patch	Thu Oct 09 01:32:24 2014 +0100
@@ -0,0 +1,65 @@
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/buildtree.make openjdk/hotspot/make/linux/makefiles/buildtree.make
+--- openjdk.orig/hotspot/make/linux/makefiles/buildtree.make	2014-07-14 04:12:31.000000000 +0100
++++ openjdk/hotspot/make/linux/makefiles/buildtree.make	2014-10-09 01:27:44.721520676 +0100
+@@ -197,6 +197,8 @@
+ 	echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
+ 	echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
+ 	echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
++	echo "DERIVATIVE_ID = $(DERIVATIVE_ID)"; \
++	echo "DISTRIBUTION_ID = $(DISTRIBUTION_ID)"; \
+ 	echo; \
+ 	echo "# Used for platform dispatching"; \
+ 	echo "TARGET_DEFINES  = -DTARGET_OS_FAMILY_\$$(Platform_os_family)"; \
+diff -Nru openjdk.orig/hotspot/make/linux/makefiles/vm.make openjdk/hotspot/make/linux/makefiles/vm.make
+--- openjdk.orig/hotspot/make/linux/makefiles/vm.make	2014-10-09 01:26:56.716850976 +0100
++++ openjdk/hotspot/make/linux/makefiles/vm.make	2014-10-09 01:28:07.481838204 +0100
+@@ -109,11 +109,11 @@
+ endif
+ 
+ ifdef DERIVATIVE_ID
+-CPPFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
++CXXFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
+ endif
+ 
+ ifdef DISTRIBUTION_ID
+-CPPFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
++CXXFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
+ endif
+ 
+ # CFLAGS_WARN holds compiler options to suppress/enable warnings.
+diff -Nru openjdk.orig/hotspot/make/solaris/makefiles/vm.make openjdk/hotspot/make/solaris/makefiles/vm.make
+--- openjdk.orig/hotspot/make/solaris/makefiles/vm.make	2014-10-09 01:26:56.720851031 +0100
++++ openjdk/hotspot/make/solaris/makefiles/vm.make	2014-10-09 01:28:49.158419635 +0100
+@@ -85,6 +85,14 @@
+   ${HS_LIB_ARCH}     \
+   ${VM_DISTRO}
+ 
++ifdef DERIVATIVE_ID
++CXXFLAGS += -DDERIVATIVE_ID="\"$(DERIVATIVE_ID)\""
++endif
++
++ifdef DISTRIBUTION_ID
++CXXFLAGS += -DDISTRIBUTION_ID="\"$(DISTRIBUTION_ID)\""
++endif
++
+ # This is VERY important! The version define must only be supplied to vm_version.o
+ # If not, ccache will not re-use the cache at all, since the version string might contain
+ # a time and date. 
+diff -Nru openjdk.orig/hotspot/make/windows/makefiles/vm.make openjdk/hotspot/make/windows/makefiles/vm.make
+--- openjdk.orig/hotspot/make/windows/makefiles/vm.make	2014-07-14 04:12:31.000000000 +0100
++++ openjdk/hotspot/make/windows/makefiles/vm.make	2014-10-09 01:29:21.930876855 +0100
+@@ -83,6 +83,14 @@
+ # Define that so jni.h is on correct side
+ CXX_FLAGS=$(CXX_FLAGS) /D "_JNI_IMPLEMENTATION_"
+ 
++!ifdef DERIVATIVE_ID
++CXX_FLAGS = $(CPP_FLAGS) /D "DERIVATIVE_ID=\"$(DERIVATIVE_ID)\""
++!endif
++
++!ifdef DISTRIBUTION_ID
++CXX_FLAGS = $(CPP_FLAGS) /D "DISTRIBUTION_ID=\"$(DISTRIBUTION_ID)\""
++!endif
++
+ !if "$(BUILDARCH)" == "ia64"
+ STACK_SIZE="/STACK:1048576,262144"
+ !else