diff --git a/src/pdb/pdb_parse.c b/src/pdb/pdb_parse.c
index 5ae4bff3..8d75a0d2 100644
--- a/src/pdb/pdb_parse.c
+++ b/src/pdb/pdb_parse.c
@@ -74,34 +74,50 @@ pdb_info_from_data(Arena *arena, String8 data){
       // table layout: epilogue
       U32 epilogue_base_off = deleted_words_array_off + num_deleted_words*sizeof(U32);
       
-      // read table
-      if (hash_table_count > 0 && epilogue_base_off <= data.size){
-        PDB_InfoNode *first = 0;
-        PDB_InfoNode *last = 0;
-        
-        U32 record_off = epilogue_base_off;
-        for (U32 i = 0; i < hash_table_count; i += 1, record_off += 8){
-          U32 *record = (U32*)(data.str + record_off);
-          U32 relative_name_off = record[0];
-          MSF_StreamNumber sn = (MSF_StreamNumber)record[1];
+      if (epilogue_base_off <= data.size){
+        U64 record_off = epilogue_base_off;
+
+        // read table
+        if (hash_table_count > 0) {
+          PDB_InfoNode *first = 0;
+          PDB_InfoNode *last = 0;
           
-          U32 name_off = names_base_off + relative_name_off;
-          String8 name = str8_cstring_capped((char*)(data.str + name_off),
-                                             (char*)(data.str + names_base_opl));
+          for (U32 i = 0; i < hash_table_count; i += 1, record_off += 8){
+            U32 *record = (U32*)(data.str + record_off);
+            U32 relative_name_off = record[0];
+            MSF_StreamNumber sn = (MSF_StreamNumber)record[1];
+            
+            U32 name_off = names_base_off + relative_name_off;
+            String8 name = str8_cstring_capped((char*)(data.str + name_off),
+                                               (char*)(data.str + names_base_opl));
+            
+            // push info node
+            PDB_InfoNode *node = push_array(arena, PDB_InfoNode, 1);
+            SLLQueuePush(first, last, node);
+            node->string = name;
+            node->sn = sn;
+          }
           
-          // push info node
-          PDB_InfoNode *node = push_array(arena, PDB_InfoNode, 1);
-          SLLQueuePush(first, last, node);
-          node->string = name;
-          node->sn = sn;
+          result = push_array(arena, PDB_Info, 1);
+          result->first = first;
+          result->last = last;
+          result->auth_guid = *auth_guid;
         }
-        
-        result = push_array(arena, PDB_Info, 1);
-        result->first = first;
-        result->last = last;
-        result->auth_guid = *auth_guid;
+
+		// read PDB features
+        PDB_FeatureFlags features = 0;
+        for (; record_off + sizeof(PDB_FeatureSig) <= data.size; ) {
+          PDB_FeatureSig sig = 0;
+          record_off += str8_deserial_read_struct(data, record_off, &sig);
+          switch (sig) {
+          case PDB_FeatureSig_NULL: break;
+          case PDB_FeatureSig_VC140:              features |= PDB_FeatureFlag_HAS_ID_STREAM;    break;
+          case PDB_FeatureSig_NO_TYPE_MERGE:      features |= PDB_FeatureFlag_NO_TYPE_MERGE;    break;
+          case PDB_FeatureSig_MINIMAL_DEBUG_INFO: features |= PDB_FeatureFlag_MINIMAL_DBG_INFO; break;
+          }
+        }
+        result->features = features;
       }
-      
     }
   }
   
diff --git a/src/pdb/pdb_parse.h b/src/pdb/pdb_parse.h
index eb9f56e7..ec827408 100644
--- a/src/pdb/pdb_parse.h
+++ b/src/pdb/pdb_parse.h
@@ -45,6 +45,7 @@ typedef struct PDB_Info
   PDB_InfoNode *first;
   PDB_InfoNode *last;
   Guid auth_guid;
+  PDB_FeatureFlags features;
 } PDB_Info;
 
 typedef struct PDB_InfoHeader
diff --git a/src/rdi_breakpad_from_pdb/rdi_breakpad_from_pdb_main.c b/src/rdi_breakpad_from_pdb/rdi_breakpad_from_pdb_main.c
index f3c72e7e..4d16f78b 100644
--- a/src/rdi_breakpad_from_pdb/rdi_breakpad_from_pdb_main.c
+++ b/src/rdi_breakpad_from_pdb/rdi_breakpad_from_pdb_main.c
@@ -27,7 +27,6 @@
 #include "coff/coff_parse.h"
 #include "codeview/codeview.h"
 #include "codeview/codeview_parse.h"
-#include "codeview/codeview_enum.h"
 #include "msf/msf.h"
 #include "msf/msf_parse.h"
 #include "pdb/pdb.h"
@@ -44,7 +43,6 @@
 #include "coff/coff_parse.c"
 #include "codeview/codeview.c"
 #include "codeview/codeview_parse.c"
-#include "codeview/codeview_enum.c"
 #include "msf/msf.c"
 #include "msf/msf_parse.c"
 #include "pdb/pdb.c"
@@ -225,7 +223,7 @@ entry_point(CmdLine *cmdline)
   {
     convert2bake = p2r_convert(arena, user2convert);
   }
-  
+
   //- rjf: dump breakpad text
   String8List dump = {0};
   ProfScope("dump breakpad text")
diff --git a/src/rdi_from_pdb/rdi_from_pdb.c b/src/rdi_from_pdb/rdi_from_pdb.c
index 943dcca1..a56b5e6f 100644
--- a/src/rdi_from_pdb/rdi_from_pdb.c
+++ b/src/rdi_from_pdb/rdi_from_pdb.c
@@ -2957,6 +2957,11 @@ p2r_convert(Arena *arena, P2R_User2Convert *in)
     named_streams = pdb_named_stream_table_from_info(arena, info);
     MemoryCopyStruct(&auth_guid, &info->auth_guid);
     scratch_end(scratch);
+
+    if (info->features & PDB_FeatureFlag_MINIMAL_DBG_INFO) {
+      fprintf(stderr, "ERROR: PDB was linked with /DEBUG:FASTLINK (partial debug info is not supported). Please relink using /DEBUG:FULL.");
+      os_abort(1);
+    }
   }
   
   //////////////////////////////////////////////////////////////