diff --git a/src/Propel/Generator/Model/Table.php b/src/Propel/Generator/Model/Table.php
index e89316c3bb..144e933426 100644
--- a/src/Propel/Generator/Model/Table.php
+++ b/src/Propel/Generator/Model/Table.php
@@ -791,7 +791,7 @@ public function setupReferrers($throwErrors = false)
                 $foreignPrimaryKeys = $foreignTable->getPrimaryKey();
                 // check all keys are referenced in foreign key
                 foreach ($foreignPrimaryKeys as $foreignPrimaryKey) {
-                    if (!$foreignPrimaryKey->hasReferrer($foreignKey) && $throwErrors) {
+                    if (!$foreignPrimaryKey->hasReferrer($foreignKey) && !$foreignKey->isSkipSql() && $throwErrors) {
                         // foreign primary key is not being referenced in foreign key
                         throw new BuildException(sprintf(
                             'Table "%s" contains a foreign key to table "%s" but does not have a reference to foreign primary key "%s"',
diff --git a/tests/Propel/Tests/Issues/Issue1388Test.php b/tests/Propel/Tests/Issues/Issue1388Test.php
new file mode 100644
index 0000000000..da6b500c1f
--- /dev/null
+++ b/tests/Propel/Tests/Issues/Issue1388Test.php
@@ -0,0 +1,49 @@
+<?php
+/**
+ * This file is part of the Propel package.
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * @license MIT License
+ */
+namespace Propel\Tests\Issues;
+
+use Propel\Generator\Util\QuickBuilder;
+use Propel\Tests\TestCaseFixtures;
+
+/**
+ * Test : Propel should allow marked to be skipped foreign key references on table with composite primary key
+ * @group model
+ */
+class Issue1388Test extends TestCaseFixtures
+{
+    public function testSkippedIncompleteForeignReference()
+    {
+        $schema = <<<EOF
+<?xml version="1.0" encoding="utf-8"?>
+<database name="test" defaultIdMethod="native">
+    <table name="event">
+        <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
+        <column name="name" type="varchar" size="50" required="true" />
+        <column name="organiser_type_id" type="integer" required="true" />
+        <!-- This FK is incomplete -->
+        <foreign-key foreignTable="organiser" skipSql="true">
+            <reference local="organiser_type_id" foreign="type_id" />
+        </foreign-key>
+    </table>
+
+    <table name="organiser">
+        <!-- Has composite PK -->
+        <column name="id" type="integer" required="true" primaryKey="true" autoIncrement="true" />
+        <column name="secondary" type="integer" required="true" primaryKey="true" />
+        <column name="type_id" type="integer" required="true" />
+        <column name="name" type="varchar" size="50" required="true" />
+    </table>
+</database>
+EOF;
+
+        $builder = new QuickBuilder();
+        $builder->setSchema($schema);
+        $builder->buildClasses(null, true);
+    }
+}
\ No newline at end of file