diff --git a/lang/Makefile b/lang/Makefile
index fc252e810a40..9f668d992de5 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -64,6 +64,7 @@
     SUBDIR += itcl
     SUBDIR += jgnat
     SUBDIR += jython
+    SUBDIR += klone
     SUBDIR += lcc
     SUBDIR += libobjects
     SUBDIR += librep
diff --git a/lang/klone/Makefile b/lang/klone/Makefile
new file mode 100644
index 000000000000..bf38a717167c
--- /dev/null
+++ b/lang/klone/Makefile
@@ -0,0 +1,37 @@
+# Ports collection makefile for:  klone
+# Date created:			  23 Aug 2001
+# Whom:				  Kris Kennaway <kris@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	Klone
+PORTVERSION=	2.1.359
+CATEGORIES=	lang
+MASTER_SITES=	ftp://koala.inria.fr/pub/Klone/
+DISTNAME=	Klone359
+
+MAINTAINER=	ports@FreeBSD.org
+
+WRKSRC=		${WRKDIR}/Klone
+
+post-extract:
+	@sed -e s#!!PREFIX!!#${PREFIX}# \
+		${FILESDIR}/freebsd > ${WRKSRC}/Configs/freebsd
+
+do-configure:
+	@cp -f ${WRKSRC}/Configs/freebsd ${WRKSRC}/Config.freebsd
+	@echo "freebsd" > ${WRKSRC}/.dir
+	@rm -f makefile
+
+do-install:
+	${MKDIR} ${PREFIX}/lib/klone/scripts
+	${INSTALL_PROGRAM} ${WRKSRC}/klone ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/kl/* ${PREFIX}/lib/klone
+	${INSTALL_SCRIPT} ${WRKSRC}/scripts/* ${PREFIX}/lib/klone/scripts
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/klone
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/klone
+.endif
+
+.include <bsd.port.mk>
diff --git a/lang/klone/distinfo b/lang/klone/distinfo
new file mode 100644
index 000000000000..2cd2512eb578
--- /dev/null
+++ b/lang/klone/distinfo
@@ -0,0 +1,3 @@
+MD5 (Klone359.tar.gz) = 2ed4c28fd1f86f1dc460e296006f6f92
+RMD160 (Klone359.tar.gz) = 22562f54d637943190e01d2f9eba0b0a29691122
+SHA1 (Klone359.tar.gz) = 5f25b239b2def33b080d5f3ba2caac86240e843e
diff --git a/lang/klone/files/freebsd b/lang/klone/files/freebsd
new file mode 100644
index 000000000000..aaddf9333139
--- /dev/null
+++ b/lang/klone/files/freebsd
@@ -0,0 +1,18 @@
+##################### KLONE CONFIG FILE ######################################
+#: FreeBSD
+                    # defines this to the binary type: sun4, sun4solaris...
+MACHINE_TYPE   =    freebsd
+                    # default path for looking for klone files
+KLONEPATH      ="\".:~/kl:!!PREFIX!!/lib/klone\""
+                    # system-needed libraries
+LIBS           =
+                    # compilation flags , -O or -g
+FLAGS	       = -O
+                    # name (absolute or relative) of the compiler: cc, /bin/cc
+C_COMPILER     = cc
+                    # various defines:
+DEFINES        = -DSYSV_TIME -DVOID_SIGNALS
+                    # other linker -specific flags
+LFLAGS         =
+                    # unix command to apply to executable after link 
+POSTPROCESSING = :
diff --git a/lang/klone/pkg-comment b/lang/klone/pkg-comment
new file mode 100644
index 000000000000..d7d13a023711
--- /dev/null
+++ b/lang/klone/pkg-comment
@@ -0,0 +1 @@
+Small, Lisp-like interpreted language
diff --git a/lang/klone/pkg-descr b/lang/klone/pkg-descr
new file mode 100644
index 000000000000..b736c35ae7c5
--- /dev/null
+++ b/lang/klone/pkg-descr
@@ -0,0 +1,7 @@
+KLONE is a small and fast fully interpreted language intended to be
+embedded into C applications to provide them with a powerful, yet fast
+and small extension language. Its syntax is very inspired from Lisp (its
+external syntax has been kept as close as possible to Common Lisp as
+possible), but its implementation is original and efficient, to give full
+extensibility, intimate interfacing to C, incremental garbage collection,
+and full portability on either K&R or ANSI C.
diff --git a/lang/klone/pkg-plist b/lang/klone/pkg-plist
new file mode 100644
index 000000000000..cbe9611415f9
--- /dev/null
+++ b/lang/klone/pkg-plist
@@ -0,0 +1,283 @@
+bin/klone
+lib/klone/++.kl
+lib/klone/+=.kl
+lib/klone/AUTODOC.DIR
+lib/klone/AUTODOC.PAT
+lib/klone/AUTOLOAD.DIR
+lib/klone/AUTOLOAD.PAT
+lib/klone/C-extension.kl
+lib/klone/L.kl
+lib/klone/PE.kl
+lib/klone/PF.kl
+lib/klone/PV.kl
+lib/klone/Point.kl
+lib/klone/Symbol.kl
+lib/klone/T.kl
+lib/klone/ackerman.kl
+lib/klone/add.kl
+lib/klone/ascii-7bits.kl
+lib/klone/ascii-progress-bar.kl
+lib/klone/assignment.kl
+lib/klone/atom-equal-fixed.kl
+lib/klone/autoload.kl
+lib/klone/backquote.kl
+lib/klone/basename.kl
+lib/klone/byte-to-bits.kl
+lib/klone/cadr.kl
+lib/klone/cd.kl
+lib/klone/cgi.kl
+lib/klone/checksums.kl
+lib/klone/closure.kl
+lib/klone/colors.kl
+lib/klone/concat-paths.kl
+lib/klone/cond.kl
+lib/klone/cur-date.kl
+lib/klone/date.kl
+lib/klone/days.kl
+lib/klone/dbtk.kl
+lib/klone/defaccessor.kl
+lib/klone/default.kl
+lib/klone/defmacrod.kl
+lib/klone/defstruct-soft.kl
+lib/klone/defstruct.kl
+lib/klone/defunm.kl
+lib/klone/defvar.kl
+lib/klone/delete-item.kl
+lib/klone/do-tests.kl
+lib/klone/doc-autoloadables.kl
+lib/klone/doc-herited.kl
+lib/klone/dofile.kl
+lib/klone/doline.kl
+lib/klone/domatch.kl
+lib/klone/doregexp.kl
+lib/klone/dosort.kl
+lib/klone/dump.kl
+lib/klone/emacs-compat-interactive.kl
+lib/klone/equal.kl
+lib/klone/evalhook.kl
+lib/klone/every.kl
+lib/klone/expand-num.kl
+lib/klone/expand-real.kl
+lib/klone/expand-tabs.kl
+lib/klone/fact.kl
+lib/klone/fatal-error.kl
+lib/klone/fib.kl
+lib/klone/file-info.kl
+lib/klone/file-lock.kl
+lib/klone/file-type.kl
+lib/klone/filedatabase.kl
+lib/klone/filter-list.kl
+lib/klone/ftplib.kl
+lib/klone/gensym.kl
+lib/klone/getopts.kl
+lib/klone/gmon-dump
+lib/klone/grep.kl
+lib/klone/hooks.kl
+lib/klone/hostname.kl
+lib/klone/hostname2.kl
+lib/klone/html-quote.kl
+lib/klone/itox.kl
+lib/klone/kdb.kl
+lib/klone/klone-ref.txt
+lib/klone/klone-update
+lib/klone/klone1-compat.kl
+lib/klone/klone2.kl
+lib/klone/kltk.kl
+lib/klone/lappend.kl
+lib/klone/last-catched.kl
+lib/klone/let.kl
+lib/klone/linebase.kl
+lib/klone/list-get.kl
+lib/klone/list-partial-equal.kl
+lib/klone/lreverse.kl
+lib/klone/macroexpand.kl
+lib/klone/mail-stack-dump-on-error-to.kl
+lib/klone/make-subr.kl
+lib/klone/man.kl
+lib/klone/map-symbols.kl
+lib/klone/mapdir.kl
+lib/klone/maphash.kl
+lib/klone/math.kl
+lib/klone/mcheck.kl
+lib/klone/meminfo.kl
+lib/klone/meta-instance.kl
+lib/klone/mleak-test.kl
+lib/klone/non-nil-or.kl
+lib/klone/nth-for-num.kl
+lib/klone/numeric.kl
+lib/klone/objsysmeth.kl
+lib/klone/oblist.kl
+lib/klone/octal.kl
+lib/klone/poor-clos.kl
+lib/klone/position.kl
+lib/klone/pretty.kl
+lib/klone/print-exit.kl
+lib/klone/print-margin.kl
+lib/klone/print-read.kl
+lib/klone/print-stack.kl
+lib/klone/print.kl
+lib/klone/printf.kl
+lib/klone/process-id.kl
+lib/klone/pwd.kl
+lib/klone/quote-regex.kl
+lib/klone/random.kl
+lib/klone/re-nocase.kl
+lib/klone/read-pending.kl
+lib/klone/real-equal.kl
+lib/klone/ref.kl
+lib/klone/remove.kl
+lib/klone/replace-string.kl
+lib/klone/require.kl
+lib/klone/rmkdir.kl
+lib/klone/sappend.kl
+lib/klone/scripts/README
+lib/klone/scripts/Show
+lib/klone/scripts/TEMPLATE
+lib/klone/scripts/Z2z
+lib/klone/scripts/bad-blocks
+lib/klone/scripts/base64-decode
+lib/klone/scripts/bin2iso2
+lib/klone/scripts/bits
+lib/klone/scripts/bspinfo
+lib/klone/scripts/cdromsize
+lib/klone/scripts/cgi-base
+lib/klone/scripts/cgi-klone-documentation
+lib/klone/scripts/cgi-oenologie-reservation
+lib/klone/scripts/cgi-xfree-modelines
+lib/klone/scripts/cgi-xfree-modelines-fr
+lib/klone/scripts/check-old-gets
+lib/klone/scripts/checkmbox
+lib/klone/scripts/cmpfirst
+lib/klone/scripts/coffee
+lib/klone/scripts/colors
+lib/klone/scripts/copy-date
+lib/klone/scripts/curtime
+lib/klone/scripts/diskchange
+lib/klone/scripts/end-marker
+lib/klone/scripts/enumerate
+lib/klone/scripts/extract-hrefs
+lib/klone/scripts/file-case
+lib/klone/scripts/file-is-size
+lib/klone/scripts/file-test
+lib/klone/scripts/filedatabase-upgrade
+lib/klone/scripts/filenames-non-83
+lib/klone/scripts/filesize
+lib/klone/scripts/find-duplicated-files
+lib/klone/scripts/find-old-syntax
+lib/klone/scripts/fix-frame-ps
+lib/klone/scripts/fix-klone-scripts-path
+lib/klone/scripts/fix-koalabot-log
+lib/klone/scripts/fixframetext
+lib/klone/scripts/floppies
+lib/klone/scripts/floppy-salvage
+lib/klone/scripts/fold-lines
+lib/klone/scripts/follow-link
+lib/klone/scripts/ftp-list-news
+lib/klone/scripts/getftp
+lib/klone/scripts/gmail
+lib/klone/scripts/gmon-dump
+lib/klone/scripts/gnews
+lib/klone/scripts/gr
+lib/klone/scripts/hexgrep
+lib/klone/scripts/html-norobots
+lib/klone/scripts/html-quote
+lib/klone/scripts/idraw2text
+lib/klone/scripts/ifdef-expand
+lib/klone/scripts/k-archie
+lib/klone/scripts/kfortress
+lib/klone/scripts/kget
+lib/klone/scripts/klone-autoload-docs
+lib/klone/scripts/klone-update
+lib/klone/scripts/kxf2xml
+lib/klone/scripts/kxhtml
+lib/klone/scripts/linelength
+lib/klone/scripts/ll2le
+lib/klone/scripts/lpt
+lib/klone/scripts/lr
+lib/klone/scripts/make-file
+lib/klone/scripts/mksdir
+lib/klone/scripts/mkshadowdir
+lib/klone/scripts/monitor-file
+lib/klone/scripts/mosaic-new
+lib/klone/scripts/netscape-fix
+lib/klone/scripts/netscape-new-url
+lib/klone/scripts/num
+lib/klone/scripts/numdate
+lib/klone/scripts/qc-check
+lib/klone/scripts/qpak
+lib/klone/scripts/randword
+lib/klone/scripts/replace-strings
+lib/klone/scripts/reverse
+lib/klone/scripts/save-as-mh
+lib/klone/scripts/scalc3-txt-clean
+lib/klone/scripts/sfv-fix
+lib/klone/scripts/slowpipe
+lib/klone/scripts/spy-encode
+lib/klone/scripts/strip-mans
+lib/klone/scripts/tar-chunk
+lib/klone/scripts/timeout
+lib/klone/scripts/tkdir
+lib/klone/scripts/tolower
+lib/klone/scripts/vcat
+lib/klone/scripts/w3q
+lib/klone/scripts/wget-fix-base
+lib/klone/scripts/wrd2txt
+lib/klone/scripts/wrd2xml
+lib/klone/scripts/wwwboards2txt
+lib/klone/scripts/xdoc-strip
+lib/klone/scripts/xfree-modelines
+lib/klone/scripts/xmh-add-date
+lib/klone/scripts/xmh-add-from-headers
+lib/klone/scripts/xmh-process-mail-errors
+lib/klone/scripts/xmh-remove-duplicates
+lib/klone/scripts/xmh-thread
+lib/klone/scripts/xmh-wordwrap
+lib/klone/scripts/xml2kxf
+lib/klone/scripts/xmlpp
+lib/klone/scripts/xmlstats
+lib/klone/scripts/xpm-clean
+lib/klone/scripts/zirconlog-clean
+lib/klone/sdb.kl
+lib/klone/seek.kl
+lib/klone/setqn.kl
+lib/klone/sets.kl
+lib/klone/sh-package.kl
+lib/klone/sh.kl
+lib/klone/shell.kl
+lib/klone/signalnames.kl
+lib/klone/slot-funcs.kl
+lib/klone/smartdoc.kl
+lib/klone/smartloader.kl
+lib/klone/some.kl
+lib/klone/stack-dump.kl
+lib/klone/statparams.kl
+lib/klone/stdin.kl
+lib/klone/store-error-name.kl
+lib/klone/stringcase.kl
+lib/klone/struct-lite.kl
+lib/klone/sub-toplevel.kl
+lib/klone/subseq-ptr.kl
+lib/klone/sw2re.kl
+lib/klone/symbol-plist.kl
+lib/klone/system-and-pipes.kl
+lib/klone/time.kl
+lib/klone/trace-all.kl
+lib/klone/trace.kl
+lib/klone/trap-error.kl
+lib/klone/unboundp.kl
+lib/klone/unless.kl
+lib/klone/utf8.kl
+lib/klone/verbose-p.kl
+lib/klone/version-num.kl
+lib/klone/when.kl
+lib/klone/write-string.kl
+lib/klone/xml-kxf.kl
+lib/klone/xml-sxp.kl
+lib/klone/xpm-format.kl
+%%PORTDOCS%%share/doc/klone/KloneReference.ps
+%%PORTDOCS%%share/doc/klone/Profiler.readme
+%%PORTDOCS%%share/doc/klone/amc-lisp.el
+%%PORTDOCS%%share/doc/klone/xml-sxp.txt
+%%PORTDOCS%%@dirrm share/doc/klone
+@dirrm lib/klone/scripts
+@dirrm lib/klone