--- a/src/Makefile
+++ b/src/Makefile
@@ -3,9 +3,9 @@
 GRAPHDIR?=../graphics
 
 CXX = g++
-CXXFLAGS =  -I . -I libmidi -ggdb -Wall -ansi
+CXXFLAGS =  -I . -I libmidi -Wall -ansi -O2
 CXXFLAGS += `pkg-config --cflags gtkmm-2.4 gconfmm-2.6 gtkglextmm-1.2 alsa` -DGRAPHDIR="\"$(GRAPHDIR)\""
-LDFLAGS = `pkg-config --libs gtkmm-2.4 gconfmm-2.6 gtkglextmm-1.2 alsa`
+LDLIBS = `pkg-config --libs gtkmm-2.4 gconfmm-2.6 gtkglextmm-1.2 alsa`
 TARGET = linthesia
 
 all: $(TARGET)
@@ -16,7 +16,7 @@
 	MenuLayout.o DeviceTile.o StringTile.o MidiComm.o \
 	TrackSelectionState.o TrackTile.o PlayingState.o \
 	StatsState.o KeyboardDisplay.o libmidi/libmidi.a
-	$(CXX) $(LDFLAGS) -o $@ $^
+	$(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
 
 libmidi/libmidi.a:
 	$(MAKE) -C libmidi
--- a/src/libmidi/Makefile
+++ b/src/libmidi/Makefile
@@ -1,7 +1,7 @@
 # -*- mode: makefile-gmake; coding: utf-8 -*-
 
 CXX = g++
-CXXFLAGS = -I . -I .. -ansi -Wall
+CXXFLAGS = -I . -I .. -ansi -Wall -O2
 TARGET = libmidi.a
 
 all: $(TARGET)
