diff --git a/hermit/usr/Makefile b/hermit/usr/Makefile
index 72f13b7e7..17add6f34 100644
--- a/hermit/usr/Makefile
+++ b/hermit/usr/Makefile
@@ -57,7 +57,7 @@ libs:
 $(TMP)/gcc:
 	@echo Build final gcc
 	$Q$(MKDIR) $(TMP)/gcc
-	$Q$(CD) $(TMP)/gcc; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --with-newlib --enable-languages=c,c++ --disable-nls --disable-shared --disable-libssp --enable-threads=posix --enable-tls && $(MAKE) $(NJOBS) && $(MAKE) install
+	$Q$(CD) $(TMP)/gcc; $(TOPDIR)/gcc/configure --target=$(TARGET) --prefix=$(TOPDIR)/$(ARCH) --without-headers --with-newlib --enable-languages=c,c++,lto --disable-nls --disable-shared --disable-libssp --enable-threads=posix --enable-tls && $(MAKE) $(NJOBS) && $(MAKE) install
 
 clean:
 	@echo Cleaning toolchain
@@ -69,3 +69,4 @@ veryclean:
 	$Q$(MAKE) -C libgomp veryclean
 	$Q$(MAKE) -C examples veryclean
 	$Q$(RM) $(TOPDIR)/$(ARCH)
+	$Q$(RM) $(TMP)
diff --git a/hermit/usr/examples/Makefile b/hermit/usr/examples/Makefile
index f499248c3..f06cf84b6 100644
--- a/hermit/usr/examples/Makefile
+++ b/hermit/usr/examples/Makefile
@@ -39,7 +39,7 @@ endif
 
 default: all
 
-all: hello jacobi stream thr_hello
+all: hello hello++ jacobi stream thr_hello
 
 stream.o: stream.c
 	@echo [CC] $@
@@ -52,7 +52,7 @@ stream: stream.o
 	$Q$(OBJCOPY_FOR_TARGET) $(STRIP_DEBUG) $@
 	$Qchmod a-x $@.sym
 
-hello2: hello2.o
+hello++: hello++.o
 	@echo [LD] $@
 	$Q$(CXX_FOR_TARGET) $(LDFLAGS_FOR_TARGET) $(CXXFLAGS_FOR_TARGET) $(CFLAGS_FOR_TARGET) -o $@ $<
 	$Q$(OBJCOPY_FOR_TARGET) $(KEEP_DEBUG) $@ $@.sym
@@ -86,11 +86,11 @@ thr_hello: thr_hello.o
 
 clean:
 	@echo Cleaning examples
-	$Q$(RM) hello hello2 jacobi stream thr_hello *.sym *.o *~
+	$Q$(RM) hello hello++ jacobi stream thr_hello *.sym *.o *~
 
 veryclean:
 	@echo Propper cleaning examples
-	$Q$(RM) hello hello2 jacobi stream thr_hello *.sym *.o *~
+	$Q$(RM) hello hello++ jacobi stream thr_hello *.sym *.o *~
 
 depend:
 	$Q$(CC_FOR_TARGET) -MM $(CFLAGS_FOR_TARGET) *.c > Makefile.dep
diff --git a/hermit/usr/examples/hello++ b/hermit/usr/examples/hello++
new file mode 100755
index 000000000..3f54086c8
Binary files /dev/null and b/hermit/usr/examples/hello++ differ
diff --git a/hermit/usr/examples/hello2.cpp b/hermit/usr/examples/hello++.cpp
similarity index 100%
rename from hermit/usr/examples/hello2.cpp
rename to hermit/usr/examples/hello++.cpp