diff --git a/.latexmkrc b/.latexmkrc
new file mode 100644
index 0000000..056b79b
--- /dev/null
+++ b/.latexmkrc
@@ -0,0 +1,14 @@
+$lualatex = 'lualatex -interaction=nonstopmode';
+$pdflatex = 'pdflatex -interaction=nonstopmode';
+
+add_cus_dep('glo', 'gls', 0, 'run_makeglossaries');
+add_cus_dep('acn', 'acr', 0, 'run_makeglossaries');
+
+sub run_makeglossaries {
+  if ( $silent ) {
+    system "makeglossaries -q '$_[0]'";
+  }
+  else {
+    system "makeglossaries '$_[0]'";
+  };
+}
diff --git a/Makefile b/Makefile
index a5e7b99..8041671 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ export $TEXINPUTS
 
 DEPFLAGS = -M -MP -MF $(DEPDIR)/$*.d
 
-LATEXMK=export TEXINPUTS=$(TEXINPUTS);latexmk -use-make -f $(DEPFLAGS) -pdf $(subst .pdf,.tex,$@) 1>>$(subst .pdf,.log,$@) 2>>$(subst .pdf,.log,$@)
+LATEXMK=export TEXINPUTS=$(TEXINPUTS);latexmk -use-make -f $(DEPFLAGS) -pdflua $(subst .pdf,.tex,$@) 1>>$(subst .pdf,.log,$@) 2>>$(subst .pdf,.log,$@)
 
 .SECONDARY: .latexmkrc
 .PHONY: clean watermark IEEE base
@@ -73,7 +73,7 @@ base: .gitignore .latexmkrc .git/hooks/post-commit
 	@echo .d >> .gitignore
 
 .latexmkrc:
-	@echo '$$pdflatex' "= 'pdflatex -interaction=nonstopmode';" >> $@
+	@cp Paper-Makefile/.latexmkrc . >> $@
 
 watermark.tex:
 	cp Paper-Makefile/watermark.tex $@