diff --git a/tests/makeotf_data/input/bug164/d1/d2/SourceSans-Test.otf b/tests/makeotf_data/input/bug164/d1/d2/SourceSans-Test.otf
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/makeotf_data/input/bug164/d1/d2/font.pfa b/tests/makeotf_data/input/bug164/d1/d2/font.pfa
new file mode 100644
index 000000000..4ac04bd76
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/font.pfa
@@ -0,0 +1,65 @@
+%!FontType1-1.1: SourceSans-Test 2.20
+%ADOt1write: (1.0.34)
+%%BeginResource: font SourceSans-Test
+12 dict dup begin
+/FontType 1 def
+/FontName /SourceSans-Test def
+/FontInfo 8 dict dup begin
+/version (2.20) def
+/Notice (Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.) def
+/Copyright (Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'.) def
+/FamilyName (Source Sans) def
+/UnderlinePosition -75 def
+end def
+/PaintType 0 def
+/FontMatrix [0.001 0 0 0.001 0 0] def
+/Encoding StandardEncoding def
+/FontBBox {52 -12 565 660} def
+end
+currentfile eexec BAB431EA06BB0A1031E1AA11919E714AC69FC4EA3B6672
+ABF3FDE103443FF5321890FEA3C9361761AC3B607C4C960F4D385045AB5EBCA8
+90FBA7C10718659A90ABF027E30B88E7D14F8D16AC4F74C85733B7705F6CF5C8
+EBAB2E0E40F736110B62422F3D642359FA764B81D9A72049DBFF40187C41455E
+5378378702658031C363F2CD4F37345F8FA78044A0491D8AE5B00254A201ADC9
+30CA211B7CAA4782B90547B9664E61F24869CF78DB4E8687FFFE91F16C9E5FF1
+186F31A78B27F54E1C146EDF26271FB25D6AD6FEF7C6577CD58340BEADDE6FFC
+AA900264B944E40145476E80CCD21E6143836F5909D71062CC93959AE79B8E83
+83907879DE05209C61D11D1236219DB0524104110DAFF742B28B499F14E126FD
+A0B725194ECC86E08F6388D0444BA0297C3D0DEB2E3B1C8EEAF8712C66B0B663
+F560C0CC421487AA0FF3D43F6D48F457D378DC3FDC3FBFE182735FEE782B8801
+D71B6BBB5D42EDB9CF55722C3867223F258B86586AE360694E1980B8BF6B3EC4
+08D39C47787B894DA23EA2DAC3297E0D49C2CAF9BC9F44E24F07AE4F5B3826E9
+F6406BEAEE900804BF3FE8C42804115163753BBA67420C52696A6BD7AFEF9266
+733FB27A68B5D05F4C091ECD0262FD43CB49605B04E19CCB129439ABE1EFA11B
+705FCA0AC57C815EA8E7E65644FDC17369A707D15D5A4D2E1596BFE6917189A8
+A2711DC2D996CA9970006BB5EF58211349AAD9B49C2D377C07024428552D8168
+2D2031300451A384F73FCFDCDF5C29A00C657B7CFC409A30E2BF2AC1944EB028
+23EC388C2A1D6B20D52EC2E817E0A063AE48AA7CFBFFD30E7BACEDCA93995CB1
+66379EA794F61F3DFFB4D9FC7C25DD5ACC48DD8EE6BBB6DE526717BDED470F33
+321CED8A2958D6F8490D834DA175A70D0F759ABD27B37C6FFE6BC0590D470A32
+91F4374CD9C6471A21BCFBC97625E3C4116D9B0C6ADF60E1F47F0B76080F725D
+53B5ADFC880200B5CFA40536E83FC0FF61BB5D5B86B115A68D95CEEAD85B8C9D
+A1E6931780781FA3FB0FDB5A575C95FED4BB91F2154DCF699885C4585B2A4AD9
+25FAD160F60F34F298B5F65386E4CBA229C37569A7BD7C58F64E20D225C8A925
+ECA90B51A3EB7E335F5FE4D6E9A6D6F8F5CC5106984801198FA2D1E43219FA92
+C8AD14E7B1610DAA215E8D63216A90D9992C5106349C40967149FDAD08EE9638
+485B07609C18C971ADCC2E04FC4A51D6B6FC0E77918C9EC1F5D0651432D84B35
+9FD0F6C03F4826D53A2DDEC99DB19EA1ACD2E040E85D07C68E7A4FE59DAE50AF
+DF8F1B67C27F14450C52EB5BE7B7232C1E35D8CDC5612A7C4DCE98767FF7059E
+6680989C0671CBACC8E7EF04DD0C9CB3B3E2B29564EE440C4119AB58E893D38D
+7136FAC9AA14E9A26AF56A31DAA71EBF7508559349A63354E5105465E83DDDE6
+E78A4D81F3995CD991B70281C228E34F6084A4D4E76BAF6CFB86EF73706910DB
+AC7EB1793FB658C9AF0288258A8D370AE2A694AB571B793BE22436C0B1A35111
+C3039ED8C9EA63598025A5EDA8DDFC3A972B982F1D1B2E7F24AF925331B9F762
+0A07166437AD880584C5D4F39C
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000000000000000
+cleartomark
+%%EndResource
+%%EOF
diff --git a/tests/makeotf_data/input/bug164/d1/d2/font.ufo/features.fea b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/features.fea
new file mode 100644
index 000000000..5110cde46
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/features.fea
@@ -0,0 +1 @@
+include(../../rel_to_main1.fea);
diff --git a/tests/makeotf_data/input/bug164/d1/d2/font.ufo/fontinfo.plist b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/fontinfo.plist
new file mode 100644
index 000000000..b10326514
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/fontinfo.plist
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>postscriptFontName</key>
+	<string>SourceSans-Test</string>
+	<key>styleName</key>
+	<string>Test</string>
+	<key>familyName</key>
+	<string>Source Sans</string>
+	<key>versionMajor</key>
+	<integer>2</integer>
+	<key>versionMinor</key>
+	<integer>20</integer>
+	<key>copyright</key>
+	<string>Copyright 2010, 2012, 2014 Adobe Systems Incorporated (http://www.adobe.com/), with Reserved Font Name 'Source'.</string>
+	<key>trademark</key>
+	<string>Source is a trademark of Adobe Systems Incorporated in the United States and/or other countries.</string>
+	<key>unitsPerEm</key>
+	<integer>1000</integer>
+	<key>postscriptUnderlinePosition</key>
+	<integer>-75</integer>
+	<key>postscriptBlueValues</key>
+	<array>
+		<integer>-12</integer>
+		<integer>0</integer>
+		<integer>486</integer>
+		<integer>498</integer>
+		<integer>518</integer>
+		<integer>530</integer>
+		<integer>574</integer>
+		<integer>586</integer>
+		<integer>638</integer>
+		<integer>650</integer>
+		<integer>656</integer>
+		<integer>668</integer>
+		<integer>712</integer>
+		<integer>724</integer>
+	</array>
+	<key>postscriptOtherBlues</key>
+	<array>
+		<integer>-217</integer>
+		<integer>-205</integer>
+	</array>
+	<key>postscriptStemSnapH</key>
+	<array>
+		<integer>67</integer>
+		<integer>78</integer>
+	</array>
+	<key>postscriptStemSnapV</key>
+	<array>
+		<integer>84</integer>
+		<integer>95</integer>
+	</array>
+	<key>postscriptBlueScale</key>
+	<real>0.0625</real>
+	<key>postscriptBlueShift</key>
+	<integer>7</integer>
+	<key>postscriptBlueFuzz</key>
+	<integer>0</integer>
+</dict>
+</plist>
diff --git a/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/_notdef.glif b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/_notdef.glif
new file mode 100644
index 000000000..3dd78a098
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/_notdef.glif
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name=".notdef" format="1" >
+	<advance width="653"/>
+	<outline>
+		<contour>
+			<point x="89" y="0" type="line"/>
+			<point x="565" y="0" type="line"/>
+			<point x="565" y="660" type="line"/>
+			<point x="89" y="660" type="line"/>
+		</contour>
+		<contour>
+			<point x="197" y="58" type="line"/>
+			<point x="271" y="190" type="line"/>
+			<point x="325" y="293" type="line"/>
+			<point x="329" y="293" type="line"/>
+			<point x="381" y="190" type="line"/>
+			<point x="454" y="58" type="line"/>
+		</contour>
+		<contour>
+			<point x="325" y="387" type="line"/>
+			<point x="275" y="481" type="line"/>
+			<point x="209" y="600" type="line"/>
+			<point x="444" y="600" type="line"/>
+			<point x="378" y="481" type="line"/>
+			<point x="329" y="387" type="line"/>
+		</contour>
+		<contour>
+			<point x="154" y="110" type="line"/>
+			<point x="154" y="572" type="line"/>
+			<point x="281" y="340" type="line"/>
+		</contour>
+		<contour>
+			<point x="498" y="110" type="line"/>
+			<point x="372" y="340" type="line"/>
+			<point x="498" y="572" type="line"/>
+		</contour>
+	</outline>
+</glyph>
diff --git a/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/a.glif b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/a.glif
new file mode 100644
index 000000000..e993f9b7c
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/a.glif
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="a" format="1" >
+	<advance width="504"/>
+	<outline>
+		<contour>
+			<point x="194" y="-12" type="curve"/>
+			<point x="255" y="-12" />
+			<point x="309" y="20" />
+			<point x="355" y="58" type="curve"/>
+			<point x="358" y="58" type="line"/>
+			<point x="365" y="0" type="line"/>
+			<point x="433" y="0" type="line"/>
+			<point x="433" y="298" type="line"/>
+			<point x="433" y="419" />
+			<point x="383" y="498" />
+			<point x="264" y="498" type="curve"/>
+			<point x="186" y="498" />
+			<point x="118" y="464" />
+			<point x="73" y="435" type="curve"/>
+			<point x="105" y="378" type="line"/>
+			<point x="143" y="404" />
+			<point x="194" y="430" />
+			<point x="250" y="430" type="curve"/>
+			<point x="330" y="430" />
+			<point x="350" y="370" />
+			<point x="350" y="308" type="curve"/>
+			<point x="143" y="285" />
+			<point x="52" y="232" />
+			<point x="52" y="126" type="curve"/>
+			<point x="52" y="39" />
+			<point x="113" y="-12" />
+		</contour>
+		<contour>
+			<point x="218" y="54" type="curve"/>
+			<point x="170" y="54" />
+			<point x="132" y="77" />
+			<point x="132" y="132" type="curve"/>
+			<point x="132" y="194" />
+			<point x="188" y="234" />
+			<point x="350" y="254" type="curve"/>
+			<point x="350" y="119" type="line"/>
+			<point x="303" y="77" />
+			<point x="265" y="54" />
+		</contour>
+	</outline>
+</glyph>
diff --git a/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/contents.plist b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/contents.plist
new file mode 100644
index 000000000..676a39169
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/contents.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>.notdef</key>
+	<string>_notdef.glif</string>
+	<key>a</key>
+	<string>a.glif</string>
+	<key>negative</key>
+	<string>negative.glif</string>
+</dict>
+</plist>
diff --git a/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/negative.glif b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/negative.glif
new file mode 100644
index 000000000..319e17915
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/glyphs/negative.glif
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<glyph name="negative" format="1" >
+	<advance width="-5"/>
+	<outline>
+	</outline>
+</glyph>
diff --git a/tests/makeotf_data/input/bug164/d1/d2/font.ufo/lib.plist b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/lib.plist
new file mode 100644
index 000000000..fd3c98d43
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/lib.plist
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>public.glyphOrder</key>
+	<array>
+		<string>.notdef</string>
+		<string>a</string>
+		<string>negative</string>
+	</array>
+</dict>
+</plist>
diff --git a/tests/makeotf_data/input/bug164/d1/d2/font.ufo/metainfo.plist b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/metainfo.plist
new file mode 100644
index 000000000..776c3395e
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/font.ufo/metainfo.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>creator</key>
+	<string>com.adobe.type.tx</string>
+	<key>formatVersion</key>
+	<integer>2</integer>
+</dict>
+</plist>
diff --git a/tests/makeotf_data/input/bug164/d1/d2/rel_to_main.fea b/tests/makeotf_data/input/bug164/d1/d2/rel_to_main.fea
new file mode 100644
index 000000000..5110cde46
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/rel_to_main.fea
@@ -0,0 +1 @@
+include(../../rel_to_main1.fea);
diff --git a/tests/makeotf_data/input/bug164/d1/d2/rel_to_parent.fea b/tests/makeotf_data/input/bug164/d1/d2/rel_to_parent.fea
new file mode 100644
index 000000000..e1953feaf
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/d2/rel_to_parent.fea
@@ -0,0 +1 @@
+include(../../rel_to_parent1.fea);
diff --git a/tests/makeotf_data/input/bug164/d1/include2.fea b/tests/makeotf_data/input/bug164/d1/include2.fea
new file mode 100644
index 000000000..e4ee1e550
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/d1/include2.fea
@@ -0,0 +1,5 @@
+languagesystem DLFT dflt;
+
+feature tst1 {
+	sub a by a;
+} tst1;
diff --git a/tests/makeotf_data/input/bug164/rel_to_main1.fea b/tests/makeotf_data/input/bug164/rel_to_main1.fea
new file mode 100644
index 000000000..5aa12b576
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/rel_to_main1.fea
@@ -0,0 +1 @@
+include (../include2.fea);
diff --git a/tests/makeotf_data/input/bug164/rel_to_parent1.fea b/tests/makeotf_data/input/bug164/rel_to_parent1.fea
new file mode 100644
index 000000000..fa5a190fa
--- /dev/null
+++ b/tests/makeotf_data/input/bug164/rel_to_parent1.fea
@@ -0,0 +1 @@
+include (d1/include2.fea);
diff --git a/tests/makeotf_test.py b/tests/makeotf_test.py
index f5b43023f..6b7bfbf73 100755
--- a/tests/makeotf_test.py
+++ b/tests/makeotf_test.py
@@ -17,7 +17,7 @@
 from runner import main as runner
 from differ import main as differ, SPLIT_MARKER
 from test_utils import (get_input_path, get_expected_path, get_temp_file_path,
-                        generate_ttx_dump)
+                        generate_ttx_dump, font_has_table)
 
 TOOL = 'makeotf'
 CMD = ['-t', TOOL]
@@ -497,3 +497,34 @@ def test_update_cff_bbox_bug617():
                    '    <checkSumAdjustment value=' + SPLIT_MARKER +
                    '    <created value=' + SPLIT_MARKER +
                    '    <modified value='])
+
+
+@pytest.mark.parametrize('feat_filename', [
+    'bug164/d1/d2/rel_to_main.fea',
+    'bug164/d1/d2/rel_to_parent.fea',
+])
+def test_feature_includes_type1_bug164(feat_filename):
+    input_filename = "bug164/d1/d2/font.pfa"
+    otf_path = get_temp_file_path()
+
+    runner(CMD + ['-o',
+                  'f', '_{}'.format(get_input_path(input_filename)),
+                  'ff', '_{}'.format(get_input_path(feat_filename)),
+                  'o', '_{}'.format(otf_path)])
+
+    assert font_has_table(otf_path, 'head')
+
+
+def test_feature_includes_ufo_bug164():
+    input_filename = "bug164/d1/d2/font.ufo"
+    otf_path = get_temp_file_path()
+
+    stderr_path = runner(
+        CMD + ['-s', '-e', '-o',
+               'f', '_{}'.format(get_input_path(input_filename)),
+               'o', '_{}'.format(otf_path)])
+
+    with open(stderr_path, 'rb') as f:
+        output = f.read()
+    assert(b"[FATAL] <SourceSans-Test> include file <../../rel_to_main1.fea> "
+           b"not found [font.ufo/features.fea 1]") in output