diff --git a/src/utilities/CrcDatabaseGenerator.java b/src/utilities/CrcDatabaseGenerator.java
index 1940c5f2a..6112dfa9b 100644
--- a/src/utilities/CrcDatabaseGenerator.java
+++ b/src/utilities/CrcDatabaseGenerator.java
@@ -27,6 +27,9 @@ public class CrcDatabaseGenerator {
 			if (output)
 				System.out.printf("Loading CrcStringTableData... [%.3f]%n", (System.nanoTime()-start)/1E6);
 			addStringTable(database);
+			if (output)
+				System.out.printf("Loading BuffTable...          [%.3f]%n", (System.nanoTime()-start)/1E6);
+			addBuffTable(database);
 			if (output)
 				System.out.printf("Loading Clientdata...         [%.3f]%n", (System.nanoTime()-start)/1E6);
 			addClientdata(database);
@@ -47,6 +50,13 @@ public class CrcDatabaseGenerator {
 		}
 	}
 	
+	private static void addBuffTable(CrcDatabase database) {
+		DatatableData data = (DatatableData) ClientFactory.getInfoFromFile("datatables/buff/buff.iff");
+		for (int row = 0; row < data.getRowCount(); row++) {
+			database.addCrcBatch((String) data.getCell(row, 0));
+		}
+	}
+	
 	private static void addClientdata(CrcDatabase database) {
 		try {
 			Files.walkFileTree(new File("clientdata"+File.separator+"object").toPath(), new SimpleFileVisitor<Path>() {