diff --git a/.gitattributes b/.gitattributes
index bae55fcce..73c989a7e 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,4 +3,7 @@
 fpga/fpga.bit -crlf -diff
 *.bin -crlf -diff
 *.z -crlf -diff
- 
\ No newline at end of file
+# Force LF
+*.c text=auto eol=lf
+*.h text=auto eol=lf
+*.lua text=auto eol=lf
diff --git a/.gitignore b/.gitignore
index 9a12efbe5..38058230d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@
 *.exe
 *.dsym
 version.c
+*.json
 
 !client/hardnested/*.bin
 !client/hardnested/tables/*.z