--- a/jdk/src/java.base/unix/native/libjava/java_props_md.c	Sat Jul 25 08:50:45 2015 +0300
+++ b/jdk/src/java.base/unix/native/libjava/java_props_md.c	Mon Jul 27 19:50:14 2015 +0200
@@ -503,8 +503,21 @@
         struct utsname name;
         uname(&name);
         sprops.os_name = strdup(name.sysname);
+#ifdef _AIX
+        {
+            char *os_version = malloc(strlen(name.version) +
+                                      strlen(name.release) + 2);
+            if (os_version != NULL) {
+                strcpy(os_version, name.version);
+                strcat(os_version, ".");
+                strcat(os_version, name.release);
+            }
+            sprops.os_version = os_version;
+        }
+#else
         sprops.os_version = strdup(name.release);
-#endif
+#endif /* _AIX   */
+#endif /* MACOSX */
 
         sprops.os_arch = ARCHPROPNAME;
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/java/lang/System/OsVersionTest.java	Mon Jul 27 19:50:14 2015 +0200
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2015 SAP SE.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+import jdk.testlibrary.OutputAnalyzer;
+import jdk.testlibrary.Platform;
+import jdk.testlibrary.ProcessTools;
+
+/*
+ * @test
+ * @bug 8132374
+ * @summary Check that the value of the os.version property is equal
+ *          to the value of the corresponding OS provided tools.
+ * @library /lib/testlibrary
+ * @run main OsVersionTest
+ * @author Volker Simonis
+ */
+public class OsVersionTest {
+
+    public static void main(String args[]) throws Throwable {
+        final String osVersion = System.getProperty("os.version");
+        if (osVersion == null) {
+            throw new Error("Cant query 'os.version' property!");
+        }
+        if (Platform.isLinux() || Platform.isSolaris()) {
+            OutputAnalyzer output = ProcessTools.executeProcess("uname", "-r");
+            if (!osVersion.equals(output.getOutput().trim())) {
+                throw new Error(osVersion + " != " + output.getOutput().trim());
+            }
+        }
+        else if (Platform.isOSX()) {
+            OutputAnalyzer output = ProcessTools.executeProcess("sw_vers", "-productVersion");
+            if (!osVersion.equals(output.getOutput().trim())) {
+                throw new Error(osVersion + " != " + output.getOutput().trim());
+            }
+        }
+        else if (Platform.isAix()) {
+            OutputAnalyzer output1 = ProcessTools.executeProcess("uname", "-v");
+            OutputAnalyzer output2 = ProcessTools.executeProcess("uname", "-r");
+            String version = output1.getOutput().trim() + "." + output2.getOutput().trim();
+            if (!osVersion.equals(version)) {
+                throw new Error(osVersion + " != " + version);
+            }
+        }
+        else if (Platform.isWindows()) {
+            OutputAnalyzer output = ProcessTools.executeProcess("cmd", "/c", "ver");
+            String version = output.firstMatch(".+\\[Version ([0-9.]+)\\]", 1);
+            if (version == null || !version.startsWith(osVersion)) {
+                throw new Error(osVersion + " != " + version);
+            }
+        }
+        else {
+            System.out.println("This test is currently not supported on " +
+                               Platform.getOsName());
+        }
+    }
+}