diff --git a/Makefile.in b/Makefile.in
index ec0cd8d..2e46ec9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -286,7 +286,7 @@ install-application: \
 
 	@$(INSTALL_DATA) \
 		$(srcdir)/ui/@OSNAME@.ui.xml \
-		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME).ui.xml
+		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PRODUCT_NAME).ui.xml
 
 	@$(MKDIR) \
 		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/keypad
diff --git a/pw3270.cbp b/pw3270.cbp
index 51d8141..690db65 100644
--- a/pw3270.cbp
+++ b/pw3270.cbp
@@ -54,6 +54,9 @@
 		<Unit filename="src/include/pw3270/toolbar.h" />
 		<Unit filename="src/include/pw3270/window.h" />
 		<Unit filename="src/include/v3270/keyfile.h" />
+		<Unit filename="src/main/builder.c">
+			<Option compilerVar="CC" />
+		</Unit>
 		<Unit filename="src/main/main.c">
 			<Option compilerVar="CC" />
 		</Unit>
--
libgit2 0.21.2