diff --git a/Makefile b/Makefile
index bf764b3..5a7ab84 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/include/appclient.h \
 		$(PACKAGE)-$(VERSION)/include/appserver.h \
 		$(PACKAGE)-$(VERSION)/include/array.h \
+		$(PACKAGE)-$(VERSION)/include/buffer.h \
 		$(PACKAGE)-$(VERSION)/include/config.h \
 		$(PACKAGE)-$(VERSION)/include/event.h \
 		$(PACKAGE)-$(VERSION)/include/hash.h \
@@ -34,6 +35,7 @@ dist:
 		$(PACKAGE)-$(VERSION)/src/appinterface.c \
 		$(PACKAGE)-$(VERSION)/src/appserver.c \
 		$(PACKAGE)-$(VERSION)/src/array.c \
+		$(PACKAGE)-$(VERSION)/src/buffer.c \
 		$(PACKAGE)-$(VERSION)/src/config.c \
 		$(PACKAGE)-$(VERSION)/src/event.c \
 		$(PACKAGE)-$(VERSION)/src/hash.c \
diff --git a/include/System.h b/include/System.h
index a3d390f..494a080 100644
--- a/include/System.h
+++ b/include/System.h
@@ -8,6 +8,7 @@
 
 # include <appclient.h>
 # include <appserver.h>
+# include <buffer.h>
 # include <config.h>
 # include <event.h>
 # include <string.h>
diff --git a/include/project.conf b/include/project.conf
index 274780c..57ac6c0 100644
--- a/include/project.conf
+++ b/include/project.conf
@@ -1 +1 @@
-dist=System.h,appclient.h,appserver.h,array.h,config.h,event.h,hash.h,string.h
+dist=System.h,appclient.h,appserver.h,array.h,buffer.h,config.h,event.h,hash.h,string.h
diff --git a/src/Makefile b/src/Makefile
index 90c5a1a..c5ce87f 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -15,7 +15,7 @@ INSTALL	= install
 
 all: $(TARGETS)
 
-libSystem_OBJS = appclient.o appinterface.o appserver.o array.o config.o event.o hash.o string.o
+libSystem_OBJS = appclient.o appinterface.o appserver.o array.o buffer.o config.o event.o hash.o string.o
 libSystem_CFLAGS = $(CFLAGSF) $(CFLAGS)
 libSystem.a: $(libSystem_OBJS)
 	$(AR) libSystem.a $(libSystem_OBJS)
@@ -35,6 +35,9 @@ appserver.o: appserver.c
 array.o: array.c
 	$(CC) $(libSystem_CFLAGS) -c array.c
 
+buffer.o: buffer.c
+	$(CC) $(libSystem_CFLAGS) -c buffer.c
+
 config.o: config.c
 	$(CC) $(libSystem_CFLAGS) -c config.c
 
diff --git a/src/project.conf b/src/project.conf
index f8f37e4..b4158ba 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -6,4 +6,4 @@ dist=appinterface.h
 
 [libSystem]
 type=library
-sources=appclient.c,appinterface.c,appserver.c,array.c,config.c,event.c,hash.c,string.c
+sources=appclient.c,appinterface.c,appserver.c,array.c,buffer.c,config.c,event.c,hash.c,string.c