diff --git a/.hgtags b/.hgtags
index a0a0b5fd57b6bb8b235009515785be2685d01715..ffe1918593f43336fa4ad1052a42b6f7d42e3e79 100644
--- a/.hgtags
+++ b/.hgtags
@@ -924,3 +924,10 @@ e910eba1327dd1abab48a85a1b5890524ebf64af jdk8u181-b13
 1f33e21011aaeac7e0d567be4e67f8953c42f6e0 jdk8u201-b00
 1f33e21011aaeac7e0d567be4e67f8953c42f6e0 jdk8u191-b02
 87c55122c89d88cdfd4bf22a0bc9c115429cb78b jdk8u191-b03
+249320309c12b00ce2c3c489b031d2cc1c99d265 jdk8u191-b04
+aee7802a04daf266caadc5742737bdd7d9a17937 jdk8u182-b00
+6412528c09e2af2f551b496f455eb2141f20d525 jdk8u192-b00
+db3c95ad833530ff6454cf47b9063325902bbb64 jdk8u192-b01
+b9b11d994f5cab7000f53a2a9cf8a15b2b3f23b1 jdk8u192-b02
+df7eda60d98d11b89fae1eb901899dd88d33ae58 jdk8u192-b03
+7031ed34a60400768d5136df03cbf8f05e6d9a6b jdk8u192-b04
diff --git a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
index bc38491b07f497a696651107149ebd6f0ad5033d..b49feaddca50f969603c7708b40620a81db73be7 100644
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/VisibleMemberMap.java
@@ -664,6 +664,9 @@ public class VisibleMemberMap {
         // properties aren't named setA* or getA*
         private final Pattern pattern = Pattern.compile("[sg]et\\p{Upper}.*");
         private boolean isPropertyMethod(MethodDoc method) {
+            if (!configuration.javafx) {
+               return false;
+            }
             if (!method.name().endsWith("Property")) {
                 return false;
             }
@@ -675,7 +678,9 @@ public class VisibleMemberMap {
             if (pattern.matcher(method.name()).matches()) {
                 return false;
             }
-
+            if (method.typeParameters().length > 0) {
+                return false;
+            }
             return 0 == method.parameters().length
                     && !"void".equals(method.returnType().simpleTypeName());
         }
diff --git a/test/com/sun/javadoc/testMethodEndingInProperty/Test.java b/test/com/sun/javadoc/testMethodEndingInProperty/Test.java
new file mode 100644
index 0000000000000000000000000000000000000000..2d449dab151abf15fc810fa61c3a4c136ae57422
--- /dev/null
+++ b/test/com/sun/javadoc/testMethodEndingInProperty/Test.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. 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.
+ */
+
+public class Test {
+    public <T> Object fProperty() { return null; }
+}
diff --git a/test/com/sun/javadoc/testMethodEndingInProperty/TestMethodEndingInProperty.java b/test/com/sun/javadoc/testMethodEndingInProperty/TestMethodEndingInProperty.java
new file mode 100644
index 0000000000000000000000000000000000000000..b3429aa12654eeae04fec3c05ea1619a5b4b1fde
--- /dev/null
+++ b/test/com/sun/javadoc/testMethodEndingInProperty/TestMethodEndingInProperty.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright (c) 2012, 2018, Oracle and/or its affiliates. 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.
+ */
+
+/*
+ * @test
+ * @bug 8061305
+ * @summary Test methods ending in 'Property'
+ * @library ../lib/
+ * @build JavadocTester TestMethodEndingInProperty
+ * @run main TestMethodEndingInProperty
+ */
+
+public class TestMethodEndingInProperty extends JavadocTester {
+
+    private static final String BUG_ID = "8061305";
+    private static final String ERROR_OUTPUT = "com.sun.tools.doclets.formats.html.PropertyWriterImpl " +
+                                               "cannot be cast to " +
+                                               "com.sun.tools.doclets.formats.html.AbstractExecutableMemberWriter";
+
+    private static final String[] ARGS = new String[] {
+        "-d", BUG_ID, "-sourcepath", SRC_DIR, SRC_DIR + FS + "Test.java"
+    };
+
+    /**
+     * The entry point of the test.
+     * @param args the array of command line arguments.
+     */
+    public static void main(String[] args) {
+        TestMethodEndingInProperty tester = new TestMethodEndingInProperty();
+        int actual = tester.runJavadoc(ARGS);
+        int expected = 0;
+        tester.checkExitCode(expected, actual);
+        String errOut = tester.getErrorOutput();
+        if (errOut.contains(ERROR_OUTPUT)) {
+            throw new Error("Error output contained: " + ERROR_OUTPUT);
+        }
+        System.out.println("Test passed");
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getBugId() {
+        return BUG_ID;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public String getBugName() {
+        return getClass().getName();
+    }
+}