diff --git a/setup.py b/setup.py
index 46e44fd58..744b46547 100644
--- a/setup.py
+++ b/setup.py
@@ -805,11 +805,13 @@ for pi in dbpi_dirs:
     mod_name = "_" + os.path.split(os.path.split(pi)[-2])[-1] + "_dbpi"
 
     pi_sources = glob.glob(os.path.join(pi, "*.cc"))
+    pi_sources += glob.glob(os.path.join(pi, "contrib", "*.cc"))
 
     pi_ext = Library(
         config.root + ".db_plugins." + mod_name,
         define_macros=config.macros() + [("MAKE_DB_PLUGIN_LIBRARY", 1)],
         include_dirs=[
+            pi,
             os.path.join("src", "plugins", "common"),
             _db_path,
             _tl_path,
diff --git a/testdata/pymod/import_db.py b/testdata/pymod/import_db.py
index 2c1881260..154bd7198 100755
--- a/testdata/pymod/import_db.py
+++ b/testdata/pymod/import_db.py
@@ -41,6 +41,12 @@ class BasicTest(unittest.TestCase):
     v.read(os.path.join(os.path.dirname(__file__), "..", "gds", "t10.gds"))
     self.assertEqual(v.top_cell().name, "RINGO")
 
+  def test_4(self):
+    # gds2_text plugin loaded? (issue #1393)
+    v = db.Layout()
+    v.read(os.path.join(os.path.dirname(__file__), "..", "gds2_txt", "read.txt"))
+    self.assertEqual(v.top_cell().name, "RINGO")
+
 # run unit tests
 if __name__ == '__main__':
   suite = unittest.TestSuite()