diff --git a/jOOQ-test/src/org/jooq/test/oracle/create.sql b/jOOQ-test/src/org/jooq/test/oracle/create.sql
index 9e8fb3a315..238d73ffb3 100644
--- a/jOOQ-test/src/org/jooq/test/oracle/create.sql
+++ b/jOOQ-test/src/org/jooq/test/oracle/create.sql
@@ -1657,6 +1657,18 @@ DROP TYPE T_976_VARRAY_TYPE/
 DROP PROCEDURE P_976/
 DROP FUNCTION F_976/
 DROP PACKAGE PKG_976/
+DROP PACKAGE PKG_1358/
+
+CREATE OR REPLACE PACKAGE PKG_1358 AS
+  PROCEDURE P (I VARCHAR2);
+  PROCEDURE P (J VARCHAR2);
+  PROCEDURE P (K VARCHAR2);
+  PROCEDURE P2 (I VARCHAR2);
+  PROCEDURE P2 (J VARCHAR2);
+  PROCEDURE P3 (K VARCHAR2);
+  PROCEDURE P21 (I VARCHAR2);
+END PKG_1358;
+/
 
 CREATE PACKAGE PKG_976 AS
   PROCEDURE P_976 (I IN DATE, O OUT DATE);
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/Pkg_1358.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/Pkg_1358.java
new file mode 100644
index 0000000000..68da19f5cf
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/Pkg_1358.java
@@ -0,0 +1,116 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.packages;
+
+/**
+ * This class is generated by jOOQ.
+ *
+ * Convenience access to all stored procedures and functions in PKG_1358
+ */
+public final class Pkg_1358 extends org.jooq.impl.PackageImpl {
+
+	private static final long serialVersionUID = -781964650;
+
+	/**
+	 * The singleton instance of TEST.PKG_1358
+	 */
+	public static final org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358 PKG_1358 = new org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358();
+
+	/**
+	 * Call TEST.PKG_1358.P
+	 *
+	 * @param i IN parameter
+	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
+	 */
+	public static void p1(org.jooq.Configuration configuration, java.lang.String i) {
+		org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P1 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P1();
+		p.setI(i);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call TEST.PKG_1358.P
+	 *
+	 * @param j IN parameter
+	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
+	 */
+	public static void p2(org.jooq.Configuration configuration, java.lang.String j) {
+		org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P2 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P2();
+		p.setJ(j);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call TEST.PKG_1358.P
+	 *
+	 * @param k IN parameter
+	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
+	 */
+	public static void p3(org.jooq.Configuration configuration, java.lang.String k) {
+		org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P3 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P3();
+		p.setK(k);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call TEST.PKG_1358.P2
+	 *
+	 * @param i IN parameter
+	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
+	 */
+	public static void p21(org.jooq.Configuration configuration, java.lang.String i) {
+		org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P21 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P21();
+		p.setI(i);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call TEST.PKG_1358.P2
+	 *
+	 * @param j IN parameter
+	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
+	 */
+	public static void p22(org.jooq.Configuration configuration, java.lang.String j) {
+		org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P22 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P22();
+		p.setJ(j);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call TEST.PKG_1358.P21
+	 *
+	 * @param i IN parameter
+	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
+	 */
+	public static void p21(org.jooq.Configuration configuration, java.lang.String i) {
+		org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P21 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P21();
+		p.setI(i);
+
+		p.execute(configuration);
+	}
+
+	/**
+	 * Call TEST.PKG_1358.P3
+	 *
+	 * @param k IN parameter
+	 * @throws org.jooq.exception.DataAccessException if something went wrong executing the query
+	 */
+	public static void p3(org.jooq.Configuration configuration, java.lang.String k) {
+		org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P3 p = new org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358.P3();
+		p.setK(k);
+
+		p.execute(configuration);
+	}
+	/**
+	 * No further instances allowed
+	 */
+	private Pkg_1358() {
+		super("PKG_1358", org.jooq.test.oracle.generatedclasses.test.Test.TEST);
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P1.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P1.java
new file mode 100644
index 0000000000..2bd8c06d87
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P1.java
@@ -0,0 +1,35 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358;
+
+/**
+ * This class is generated by jOOQ.
+ */
+public class P1 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
+
+	private static final long serialVersionUID = 2129696345;
+
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.Parameter<java.lang.String> I = createParameter("I", org.jooq.impl.SQLDataType.VARCHAR);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public P1() {
+		super("P", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358.PKG_1358);
+
+		addInParameter(I);
+		setOverloaded(true);
+	}
+
+	/**
+	 * Set the <code>I</code> parameter to the routine
+	 */
+	public void setI(java.lang.String value) {
+		setValue(I, value);
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P2.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P2.java
new file mode 100644
index 0000000000..8da09cb37d
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P2.java
@@ -0,0 +1,35 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358;
+
+/**
+ * This class is generated by jOOQ.
+ */
+public class P2 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
+
+	private static final long serialVersionUID = 1856555895;
+
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.Parameter<java.lang.String> J = createParameter("J", org.jooq.impl.SQLDataType.VARCHAR);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public P2() {
+		super("P", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358.PKG_1358);
+
+		addInParameter(J);
+		setOverloaded(true);
+	}
+
+	/**
+	 * Set the <code>J</code> parameter to the routine
+	 */
+	public void setJ(java.lang.String value) {
+		setValue(J, value);
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P21.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P21.java
new file mode 100644
index 0000000000..1f8603f578
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P21.java
@@ -0,0 +1,34 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358;
+
+/**
+ * This class is generated by jOOQ.
+ */
+public class P21 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
+
+	private static final long serialVersionUID = 1974612037;
+
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.Parameter<java.lang.String> I = createParameter("I", org.jooq.impl.SQLDataType.VARCHAR);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public P21() {
+		super("P21", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358.PKG_1358);
+
+		addInParameter(I);
+	}
+
+	/**
+	 * Set the <code>I</code> parameter to the routine
+	 */
+	public void setI(java.lang.String value) {
+		setValue(I, value);
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P22.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P22.java
new file mode 100644
index 0000000000..1613b0465b
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P22.java
@@ -0,0 +1,35 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358;
+
+/**
+ * This class is generated by jOOQ.
+ */
+public class P22 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
+
+	private static final long serialVersionUID = 1497095477;
+
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.Parameter<java.lang.String> J = createParameter("J", org.jooq.impl.SQLDataType.VARCHAR);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public P22() {
+		super("P2", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358.PKG_1358);
+
+		addInParameter(J);
+		setOverloaded(true);
+	}
+
+	/**
+	 * Set the <code>J</code> parameter to the routine
+	 */
+	public void setJ(java.lang.String value) {
+		setValue(J, value);
+	}
+}
diff --git a/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P3.java b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P3.java
new file mode 100644
index 0000000000..e50b1b6e4f
--- /dev/null
+++ b/jOOQ-test/src/org/jooq/test/oracle/generatedclasses/test/packages/pkg_1358/P3.java
@@ -0,0 +1,34 @@
+/**
+ * This class is generated by jOOQ
+ */
+package org.jooq.test.oracle.generatedclasses.test.packages.pkg_1358;
+
+/**
+ * This class is generated by jOOQ.
+ */
+public class P3 extends org.jooq.impl.AbstractRoutine<java.lang.Void> {
+
+	private static final long serialVersionUID = -713948441;
+
+
+	/**
+	 * An uncommented item
+	 */
+	public static final org.jooq.Parameter<java.lang.String> K = createParameter("K", org.jooq.impl.SQLDataType.VARCHAR);
+
+	/**
+	 * Create a new routine call instance
+	 */
+	public P3() {
+		super("P3", org.jooq.test.oracle.generatedclasses.test.Test.TEST, org.jooq.test.oracle.generatedclasses.test.packages.Pkg_1358.PKG_1358);
+
+		addInParameter(K);
+	}
+
+	/**
+	 * Set the <code>K</code> parameter to the routine
+	 */
+	public void setK(java.lang.String value) {
+		setValue(K, value);
+	}
+}