diff --git a/Makefile.am b/Makefile.am
index 6a3243f4..1a7edfd4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,7 @@ if BUILD_SERVERTEST
 SERVERTEST=servertest
 endif
 
-SUBDIRS = po intl macros src $(PLUGINS) $(SERVERTEST)
+SUBDIRS = po intl macros src $(PLUGINS) $(SERVERTEST) docs
 
 ## to automatically rebuild aclocal.m4 if any of the macros in
 ## `macros/' change
diff --git a/configure.in b/configure.in
index e770b2c2..19b91361 100644
--- a/configure.in
+++ b/configure.in
@@ -355,6 +355,8 @@ src/lib-nongui/Makefile
 src/lib-popt/Makefile
 src/settings/Makefile
 servertest/Makefile
+docs/Makefile
+docs/help/Makefile
 plugins/Makefile
 plugins/sample/Makefile
 plugins/speech/Makefile
diff --git a/docs/.cvsignore b/docs/.cvsignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/docs/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 00000000..7aac3057
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,5 @@
+EXTRA_DIST = \
+	FAQ \
+	FORMATS
+
+SUBDIRS = help
diff --git a/docs/help/.cvsignore b/docs/help/.cvsignore
new file mode 100644
index 00000000..282522db
--- /dev/null
+++ b/docs/help/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/docs/help/Makefile.am b/docs/help/Makefile.am
new file mode 100644
index 00000000..67bb8bbb
--- /dev/null
+++ b/docs/help/Makefile.am
@@ -0,0 +1,6 @@
+helpdir = $(datadir)/irssi/help
+
+help_DATA = \
+	help
+
+EXTRA_DIST = $(help_DATA)
diff --git a/docs/help/help b/docs/help/help
new file mode 100644
index 00000000..31297c74
--- /dev/null
+++ b/docs/help/help
@@ -0,0 +1,4 @@
+Sample help file. Here work the standard text formats,
+like %_bolds%_ and %Rcolors%n. So, only thing we need now
+is the actual helps, anyone care to write them? :) Epic has
+pretty good, maybe we could use them...?