diff --git a/data/fonts/Makefile.am b/data/fonts/Makefile.am
index 143cbe51..8f7ff592 100644
--- a/data/fonts/Makefile.am
+++ b/data/fonts/Makefile.am
@@ -27,11 +27,22 @@ kates.pcf \
 lime.pcf \
 mints-mild.pcf \
 mints-strong.pcf \
-nex6x10.pcf \
+nexus.pcf \
 nu.pcf \
 smoothansi.pcf \
-snap.pcf
+snap.pcf \
+terminus-12.pcf \
+terminus-14-bold.pcf \
+terminus-14.pcf \
+terminus-16-bold.pcf \
+terminus-16.pcf \
+terminus-18-bold.pcf \
+terminus-18.pcf \
+terminus-20-bold.pcf \
+terminus-20.pcf
 
 EXTRA_DIST = $(files_DATA) \
 ARTWIZ.txt \
+TERMINUS.txt \
 XFONT.txt
+
diff --git a/data/fonts/TERMINUS.txt b/data/fonts/TERMINUS.txt
new file mode 100644
index 00000000..3341f866
--- /dev/null
+++ b/data/fonts/TERMINUS.txt
@@ -0,0 +1,94 @@
+Copyright (c) 2011 Dimitar Toshkov Zhekov,
+with Reserved Font Name "Terminus Font".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/data/fonts/nex6x10.pcf b/data/fonts/nexus.pcf
similarity index 100%
rename from data/fonts/nex6x10.pcf
rename to data/fonts/nexus.pcf
diff --git a/data/fonts/terminus-12.pcf b/data/fonts/terminus-12.pcf
new file mode 100644
index 00000000..76dc91f5
Binary files /dev/null and b/data/fonts/terminus-12.pcf differ
diff --git a/data/fonts/terminus-14-bold.pcf b/data/fonts/terminus-14-bold.pcf
new file mode 100644
index 00000000..a6fe2b71
Binary files /dev/null and b/data/fonts/terminus-14-bold.pcf differ
diff --git a/data/fonts/terminus-14.pcf b/data/fonts/terminus-14.pcf
new file mode 100644
index 00000000..722363b6
Binary files /dev/null and b/data/fonts/terminus-14.pcf differ
diff --git a/data/fonts/terminus-16-bold.pcf b/data/fonts/terminus-16-bold.pcf
new file mode 100644
index 00000000..77182abd
Binary files /dev/null and b/data/fonts/terminus-16-bold.pcf differ
diff --git a/data/fonts/terminus-16.pcf b/data/fonts/terminus-16.pcf
new file mode 100644
index 00000000..ae194a17
Binary files /dev/null and b/data/fonts/terminus-16.pcf differ
diff --git a/data/fonts/terminus-18-bold.pcf b/data/fonts/terminus-18-bold.pcf
new file mode 100644
index 00000000..6c25a061
Binary files /dev/null and b/data/fonts/terminus-18-bold.pcf differ
diff --git a/data/fonts/terminus-18.pcf b/data/fonts/terminus-18.pcf
new file mode 100644
index 00000000..a1410f21
Binary files /dev/null and b/data/fonts/terminus-18.pcf differ
diff --git a/data/fonts/terminus-20-bold.pcf b/data/fonts/terminus-20-bold.pcf
new file mode 100644
index 00000000..3dc3441a
Binary files /dev/null and b/data/fonts/terminus-20-bold.pcf differ
diff --git a/data/fonts/terminus-20.pcf b/data/fonts/terminus-20.pcf
new file mode 100644
index 00000000..e6c71877
Binary files /dev/null and b/data/fonts/terminus-20.pcf differ
diff --git a/src/bin/config.c b/src/bin/config.c
index 554ca128..54c95d46 100644
--- a/src/bin/config.c
+++ b/src/bin/config.c
@@ -62,10 +62,8 @@ config_init(void)
    if (!config)
      {
         config = calloc(1, sizeof(Config));
-//        config->font.bitmap = 0;
-//        config->font.name = eina_stringshare_add("Monospace");
         config->font.bitmap = 1;
-        config->font.name = eina_stringshare_add("nex6x10.pcf");
+        config->font.name = eina_stringshare_add("nexus.pcf");
         config->font.size = 10;
         config->scrollback = 4096;
         config->theme = eina_stringshare_add("default.edj");