diff --git a/Dockerfile b/Dockerfile
index c0f627d8d..7f08fc541 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,7 +25,10 @@ RUN apt-get -y install \
 	make \
 	cmake \
 	libc6-dev \
-        pkg-config
+        pkg-config \
+	doxygen \
+	dia \
+	graphviz
 
 # Install dependencies for native arch
 RUN apt-get -y install \
diff --git a/Doxyfile b/Doxyfile
index 931acbfbc..3c4c2f2f0 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -765,13 +765,7 @@ WARN_LOGFILE           = doc/warnings.log
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = server/ \
-                         doc/ \
-                         clients/ml50x_cpld/ \
-                         clients/ml507_ppc440_udp/pcores/ \
-                         clients/ml507_ppc440_udp/s2ss/ \
-                         clients/ml507_gtfpga_pcie/code/ \
-                         clients/opal_udp/models/send_receive/src/
+INPUT                  = src/ lib/ include/ doc/
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/Makefile b/Makefile
index 4595c3a33..8bc3fa2ad 100644
--- a/Makefile
+++ b/Makefile
@@ -77,10 +77,10 @@ endif
 
 ######## Targets ########
 
-.PHONY: all clean install release docker
+.PHONY: all clean install release docker doc
 
 # Default target: build everything
-all: $(LIBS) $(TARGETS)
+all: $(LIBS) $(TARGETS) doc
 
 # Dependencies for individual binaries
 server:  server.o $(OBJS) libs2ss.so
@@ -117,5 +117,8 @@ docker:
 	docker build -t s2ss .
 	docker run -itv $(PWD):/s2ss s2ss
 
+doc:
+	doxygen
+
 # Include auto-generated dependencies
 -include $(wildcard *.d)