diff --git a/Makefile b/Makefile
index 6dda16c..a6c00ef 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: blink/blink.1 histogram/histogram.1 upsidedown/upsidedown.1 tracefile/tracefile.1
+all: blink/blink.1 histogram/histogram.1 upsidedown/upsidedown.1 tracefile/tracefile.1 timestamp/timestamp.1
 
 blink/blink.1: blink/blink
 	pod2man blink/blink > blink/blink.1
@@ -12,6 +12,9 @@ upsidedown/upsidedown.1: upsidedown/upsidedown
 tracefile/tracefile.1: tracefile/tracefile.pod
 	pod2man tracefile/tracefile.pod > tracefile/tracefile.1
 
+timestamp/timestamp.1: timestamp/timestamp
+	pod2man timestamp/timestamp > timestamp/timestamp.1
+
 install:
-	parallel ln -sf `pwd`/{}/{} /usr/local/bin/{} ::: blink reniced em field forever neno rn stdout tracefile w4it-for-port-open upsidedown histogram goodpasswd
+	parallel ln -sf `pwd`/{}/{} /usr/local/bin/{} ::: blink reniced em field forever neno rn stdout tracefile w4it-for-port-open upsidedown histogram goodpasswd timestamp
 	parallel ln -sf `pwd`/{} /usr/local/share/man/man1/{/} ::: */*.1
diff --git a/timestamp/timestamp b/timestamp/timestamp
new file mode 100755
index 0000000..b0899cc
--- /dev/null
+++ b/timestamp/timestamp
@@ -0,0 +1,268 @@
+#!/usr/bin/perl
+
+=head1 NAME
+
+timestamp - prepend timestamp to output
+
+=head1 SYNOPSIS
+
+B<somecommand> | B<timestamp> [--delta] [--rfc|--iso|--iso-time|--epoch]
+
+=head1 DESCRIPTION
+
+B<timestamp> prepends stdin (standard input) with a timestamp.
+
+=over 9
+
+=item B<--delta>
+
+Regard start time as epoch and thus show difference between start time
+and now.
+
+
+=item B<--rfc>
+
+Output time format in RFC822 (E.g. Wed, 30 Jan 2013 13:57:58 GMT).
+
+
+=item B<--iso>
+
+Output time format in ISO8601 (E.g. 2013-01-30T13:57:58.322).
+
+
+=item B<--iso-time>
+
+Output time format in ISO8601/time only (E.g. 13:57:58.322).
+
+
+=item B<--epoch>
+
+Output time format as seconds since 1970-01-01T00:00:00 (E.g. 1359557768.423).
+
+=back
+
+=head1 EXAMPLES
+
+=head2 Timestamp vmstat
+
+B<vmstat 1 | timestamp>
+
+
+=head2 Timestamp each step in setting up/tearing down ssh connection:
+
+B<ssh localhost echo test | timestamp --delta --epoch>
+
+
+=head1 REPORTING BUGS
+
+B<timestamp> is part of tangetools. Report bugs to <tools@tange.dk>.
+
+
+=head1 AUTHOR
+
+Copyright (C) 2013 Ole Tange http://ole.tange.dk
+
+
+=head1 LICENSE
+
+Copyright (C) 2013 Free Software Foundation, Inc.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+at your option any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+=head2 Documentation license I
+
+Permission is granted to copy, distribute and/or modify this documentation
+under the terms of the GNU Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the file fdl.txt.
+
+=head2 Documentation license II
+
+You are free:
+
+=over 9
+
+=item B<to Share>
+
+to copy, distribute and transmit the work
+
+=item B<to Remix>
+
+to adapt the work
+
+=back
+
+Under the following conditions:
+
+=over 9
+
+=item B<Attribution>
+
+You must attribute the work in the manner specified by the author or
+licensor (but not in any way that suggests that they endorse you or
+your use of the work).
+
+=item B<Share Alike>
+
+If you alter, transform, or build upon this work, you may distribute
+the resulting work only under the same, similar or a compatible
+license.
+
+=back
+
+With the understanding that:
+
+=over 9
+
+=item B<Waiver>
+
+Any of the above conditions can be waived if you get permission from
+the copyright holder.
+
+=item B<Public Domain>
+
+Where the work or any of its elements is in the public domain under
+applicable law, that status is in no way affected by the license.
+
+=item B<Other Rights>
+
+In no way are any of the following rights affected by the license:
+
+=over 9
+
+=item *
+
+Your fair dealing or fair use rights, or other applicable
+copyright exceptions and limitations;
+
+=item *
+
+The author's moral rights;
+
+=item *
+
+Rights other persons may have either in the work itself or in
+how the work is used, such as publicity or privacy rights.
+
+=back
+
+=item B<Notice>
+
+For any reuse or distribution, you must make clear to others the
+license terms of this work.
+
+=back
+
+A copy of the full license is included in the file as cc-by-sa.txt.
+
+=head1 DEPENDENCIES
+
+B<timestamp> uses Perl and the Getopt::Long and Time::HiRes modules.
+
+
+=head1 SEE ALSO
+
+B<time>(1)
+
+=cut
+
+
+use Time::HiRes;
+use POSIX qw(strftime);
+use Getopt::Long;
+use strict;
+
+parse_options();
+set_defaults();
+
+$|=1;
+
+my $start = Time::HiRes::time();
+if($opt::delta) {
+    $start = Time::HiRes::time();
+} else {
+    $start = 0;
+}
+
+my ($now,$delta,$to_print,$out);
+
+while(<>) {
+    $now = Time::HiRes::time();
+    $to_print = $now - $start;
+
+    my $tz = strftime("%z", localtime($to_print));
+    $tz =~ s/(\d{2})(\d{2})/$1:$2/;
+
+    my $ms = sprintf "%03d", int(($to_print - int($to_print))*1000); 
+
+    if($opt::rfc) {
+	# RFC822 (actually RFC2822, as the year has 4 digits)
+	print strftime("%a, %d %b %Y %H:%M:%S.".$ms." %z", localtime($to_print)), " ", $_
+    } elsif($opt::iso) {
+	# ISO8601
+	print strftime("%Y-%m-%dT%H:%M:%S".$ms, localtime($to_print)), $tz , " ", $_;
+    } elsif($opt::isotime) {
+	# ISO8601 time part only
+	print strftime("%H:%M:%S.".$ms, localtime($to_print)), $tz, " ", $_;
+    } elsif($opt::epoch) {
+	# Seconds since epoch
+	print strftime("%s.".$ms, localtime($to_print)), " ", $_;
+    } else {
+	::die_bug("no format");
+    }
+}
+
+sub set_defaults {
+    if(not($opt::rfc || $opt::iso || $opt::isotime || $opt::epoch)) {
+	$opt::epoch = 1;
+	$opt::delta = 1;
+    }
+}
+
+sub parse_options {
+    $Global::version = 20130130;
+    $Global::progname = 'timestamp';
+
+    Getopt::Long::Configure ("bundling","require_order");
+    GetOptions("delta|d" => \$opt::delta,
+	       # RFC822
+	       "rfc|r" => \$opt::rfc,
+	       "iso|i" => \$opt::iso,
+	       "ged|epoch|e" => \$opt::epoch,
+	       "iso-time|isotime|time|t" => \$opt::isotime,
+	       "debug|D" => \$opt::debug,
+	       # GNU requirements
+	       "help|h" => \$opt::help,
+	       "version|V" => \$opt::version,
+	) || die_usage();
+
+    if(defined $opt::help) { die_usage(); }
+    if(defined $opt::version) { version(); exit(0); }
+    $Global::debug = $opt::debug;
+}
+
+sub die_bug {
+    my $bugid = shift;
+    print STDERR
+	("$Global::progname: This should not happen. You have found a bug.\n",
+	 "Please contact <tools\@tange.dk> and include:\n",
+	 "* The version number: $Global::version\n",
+	 "* The bugid: $bugid\n",
+	 "* The command line being run\n",
+	 "* The files being read (put the files on a webserver if they are big)\n",
+	 "\n",
+	 "If you get the error on smaller/fewer files, please include those instead.\n");
+    ::wait_and_exit(255);
+}
diff --git a/timestamp/timestamp.1 b/timestamp/timestamp.1
new file mode 100644
index 0000000..6a605c5
--- /dev/null
+++ b/timestamp/timestamp.1
@@ -0,0 +1,250 @@
+.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.16)
+.\"
+.\" Standard preamble:
+.\" ========================================================================
+.de Sp \" Vertical space (when we can't use .PP)
+.if t .sp .5v
+.if n .sp
+..
+.de Vb \" Begin verbatim text
+.ft CW
+.nf
+.ne \\$1
+..
+.de Ve \" End verbatim text
+.ft R
+.fi
+..
+.\" Set up some character translations and predefined strings.  \*(-- will
+.\" give an unbreakable dash, \*(PI will give pi, \*(L" will give a left
+.\" double quote, and \*(R" will give a right double quote.  \*(C+ will
+.\" give a nicer C++.  Capital omega is used to do unbreakable dashes and
+.\" therefore won't be available.  \*(C` and \*(C' expand to `' in nroff,
+.\" nothing in troff, for use with C<>.
+.tr \(*W-
+.ds C+ C\v'-.1v'\h'-1p'\s-2+\h'-1p'+\s0\v'.1v'\h'-1p'
+.ie n \{\
+.    ds -- \(*W-
+.    ds PI pi
+.    if (\n(.H=4u)&(1m=24u) .ds -- \(*W\h'-12u'\(*W\h'-12u'-\" diablo 10 pitch
+.    if (\n(.H=4u)&(1m=20u) .ds -- \(*W\h'-12u'\(*W\h'-8u'-\"  diablo 12 pitch
+.    ds L" ""
+.    ds R" ""
+.    ds C` ""
+.    ds C' ""
+'br\}
+.el\{\
+.    ds -- \|\(em\|
+.    ds PI \(*p
+.    ds L" ``
+.    ds R" ''
+'br\}
+.\"
+.\" Escape single quotes in literal strings from groff's Unicode transform.
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\"
+.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
+.\" entries marked with X<> in POD.  Of course, you'll have to process the
+.\" output yourself in some meaningful fashion.
+.ie \nF \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
+..
+.    nr % 0
+.    rr F
+.\}
+.el \{\
+.    de IX
+..
+.\}
+.\"
+.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
+.\" Fear.  Run.  Save yourself.  No user-serviceable parts.
+.    \" fudge factors for nroff and troff
+.if n \{\
+.    ds #H 0
+.    ds #V .8m
+.    ds #F .3m
+.    ds #[ \f1
+.    ds #] \fP
+.\}
+.if t \{\
+.    ds #H ((1u-(\\\\n(.fu%2u))*.13m)
+.    ds #V .6m
+.    ds #F 0
+.    ds #[ \&
+.    ds #] \&
+.\}
+.    \" simple accents for nroff and troff
+.if n \{\
+.    ds ' \&
+.    ds ` \&
+.    ds ^ \&
+.    ds , \&
+.    ds ~ ~
+.    ds /
+.\}
+.if t \{\
+.    ds ' \\k:\h'-(\\n(.wu*8/10-\*(#H)'\'\h"|\\n:u"
+.    ds ` \\k:\h'-(\\n(.wu*8/10-\*(#H)'\`\h'|\\n:u'
+.    ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'^\h'|\\n:u'
+.    ds , \\k:\h'-(\\n(.wu*8/10)',\h'|\\n:u'
+.    ds ~ \\k:\h'-(\\n(.wu-\*(#H-.1m)'~\h'|\\n:u'
+.    ds / \\k:\h'-(\\n(.wu*8/10-\*(#H)'\z\(sl\h'|\\n:u'
+.\}
+.    \" troff and (daisy-wheel) nroff accents
+.ds : \\k:\h'-(\\n(.wu*8/10-\*(#H+.1m+\*(#F)'\v'-\*(#V'\z.\h'.2m+\*(#F'.\h'|\\n:u'\v'\*(#V'
+.ds 8 \h'\*(#H'\(*b\h'-\*(#H'
+.ds o \\k:\h'-(\\n(.wu+\w'\(de'u-\*(#H)/2u'\v'-.3n'\*(#[\z\(de\v'.3n'\h'|\\n:u'\*(#]
+.ds d- \h'\*(#H'\(pd\h'-\w'~'u'\v'-.25m'\f2\(hy\fP\v'.25m'\h'-\*(#H'
+.ds D- D\\k:\h'-\w'D'u'\v'-.11m'\z\(hy\v'.11m'\h'|\\n:u'
+.ds th \*(#[\v'.3m'\s+1I\s-1\v'-.3m'\h'-(\w'I'u*2/3)'\s-1o\s+1\*(#]
+.ds Th \*(#[\s+2I\s-2\h'-\w'I'u*3/5'\v'-.3m'o\v'.3m'\*(#]
+.ds ae a\h'-(\w'a'u*4/10)'e
+.ds Ae A\h'-(\w'A'u*4/10)'E
+.    \" corrections for vroff
+.if v .ds ~ \\k:\h'-(\\n(.wu*9/10-\*(#H)'\s-2\u~\d\s+2\h'|\\n:u'
+.if v .ds ^ \\k:\h'-(\\n(.wu*10/11-\*(#H)'\v'-.4m'^\v'.4m'\h'|\\n:u'
+.    \" for low resolution devices (crt and lpr)
+.if \n(.H>23 .if \n(.V>19 \
+\{\
+.    ds : e
+.    ds 8 ss
+.    ds o a
+.    ds d- d\h'-1'\(ga
+.    ds D- D\h'-1'\(hy
+.    ds th \o'bp'
+.    ds Th \o'LP'
+.    ds ae ae
+.    ds Ae AE
+.\}
+.rm #[ #] #H #V #F C
+.\" ========================================================================
+.\"
+.IX Title "TIMESTAMP 1"
+.TH TIMESTAMP 1 "2013-01-30" "perl v5.14.2" "User Contributed Perl Documentation"
+.\" For nroff, turn off justification.  Always turn off hyphenation; it makes
+.\" way too many mistakes in technical documents.
+.if n .ad l
+.nh
+.SH "NAME"
+timestamp \- prepend timestamp to output
+.SH "SYNOPSIS"
+.IX Header "SYNOPSIS"
+\&\fBsomecommand\fR | \fBtimestamp\fR [\-\-delta] [\-\-rfc|\-\-iso|\-\-iso\-time|\-\-epoch]
+.SH "DESCRIPTION"
+.IX Header "DESCRIPTION"
+\&\fBtimestamp\fR prepends stdin (standard input) with a timestamp.
+.IP "\fB\-\-delta\fR" 9
+.IX Item "--delta"
+Regard start time as epoch and thus show difference between start time
+and now.
+.IP "\fB\-\-rfc\fR" 9
+.IX Item "--rfc"
+Output time format in \s-1RFC822\s0 (E.g. Wed, 30 Jan 2013 13:57:58 \s-1GMT\s0).
+.IP "\fB\-\-iso\fR" 9
+.IX Item "--iso"
+Output time format in \s-1ISO8601\s0 (E.g. 2013\-01\-30T13:57:58.322).
+.IP "\fB\-\-iso\-time\fR" 9
+.IX Item "--iso-time"
+Output time format in ISO8601/time only (E.g. 13:57:58.322).
+.IP "\fB\-\-epoch\fR" 9
+.IX Item "--epoch"
+Output time format as seconds since 1970\-01\-01T00:00:00 (E.g. 234567890.123).
+.SH "EXAMPLES"
+.IX Header "EXAMPLES"
+.SS "Timestamp vmstat"
+.IX Subsection "Timestamp vmstat"
+\&\fBvmstat 1 | timestamp\fR
+.SS "Timestamp each step in setting up/tearing down ssh connection:"
+.IX Subsection "Timestamp each step in setting up/tearing down ssh connection:"
+\&\fBssh localhost echo test | timestamp \-\-delta \-\-epoch\fR
+.SH "REPORTING BUGS"
+.IX Header "REPORTING BUGS"
+\&\fBtimestamp\fR is part of tangetools. Report bugs to <tools@tange.dk>.
+.SH "AUTHOR"
+.IX Header "AUTHOR"
+Copyright (C) 2013 Ole Tange http://ole.tange.dk
+.SH "LICENSE"
+.IX Header "LICENSE"
+Copyright (C) 2013 Free Software Foundation, Inc.
+.PP
+This program is free software; you can redistribute it and/or modify
+it under the terms of the \s-1GNU\s0 General Public License as published by
+the Free Software Foundation; either version 3 of the License, or
+at your option any later version.
+.PP
+This program is distributed in the hope that it will be useful,
+but \s-1WITHOUT\s0 \s-1ANY\s0 \s-1WARRANTY\s0; without even the implied warranty of
+\&\s-1MERCHANTABILITY\s0 or \s-1FITNESS\s0 \s-1FOR\s0 A \s-1PARTICULAR\s0 \s-1PURPOSE\s0.  See the
+\&\s-1GNU\s0 General Public License for more details.
+.PP
+You should have received a copy of the \s-1GNU\s0 General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+.SS "Documentation license I"
+.IX Subsection "Documentation license I"
+Permission is granted to copy, distribute and/or modify this documentation
+under the terms of the \s-1GNU\s0 Free Documentation License, Version 1.3 or
+any later version published by the Free Software Foundation; with no
+Invariant Sections, with no Front-Cover Texts, and with no Back-Cover
+Texts.  A copy of the license is included in the file fdl.txt.
+.SS "Documentation license \s-1II\s0"
+.IX Subsection "Documentation license II"
+You are free:
+.IP "\fBto Share\fR" 9
+.IX Item "to Share"
+to copy, distribute and transmit the work
+.IP "\fBto Remix\fR" 9
+.IX Item "to Remix"
+to adapt the work
+.PP
+Under the following conditions:
+.IP "\fBAttribution\fR" 9
+.IX Item "Attribution"
+You must attribute the work in the manner specified by the author or
+licensor (but not in any way that suggests that they endorse you or
+your use of the work).
+.IP "\fBShare Alike\fR" 9
+.IX Item "Share Alike"
+If you alter, transform, or build upon this work, you may distribute
+the resulting work only under the same, similar or a compatible
+license.
+.PP
+With the understanding that:
+.IP "\fBWaiver\fR" 9
+.IX Item "Waiver"
+Any of the above conditions can be waived if you get permission from
+the copyright holder.
+.IP "\fBPublic Domain\fR" 9
+.IX Item "Public Domain"
+Where the work or any of its elements is in the public domain under
+applicable law, that status is in no way affected by the license.
+.IP "\fBOther Rights\fR" 9
+.IX Item "Other Rights"
+In no way are any of the following rights affected by the license:
+.RS 9
+.IP "\(bu" 9
+Your fair dealing or fair use rights, or other applicable
+copyright exceptions and limitations;
+.IP "\(bu" 9
+The author's moral rights;
+.IP "\(bu" 9
+Rights other persons may have either in the work itself or in
+how the work is used, such as publicity or privacy rights.
+.RE
+.RS 9
+.RE
+.IP "\fBNotice\fR" 9
+.IX Item "Notice"
+For any reuse or distribution, you must make clear to others the
+license terms of this work.
+.PP
+A copy of the full license is included in the file as cc\-by\-sa.txt.
+.SH "DEPENDENCIES"
+.IX Header "DEPENDENCIES"
+\&\fBtimestamp\fR uses Perl and the Getopt::Long and Time::HiRes modules.
+.SH "SEE ALSO"
+.IX Header "SEE ALSO"
+\&\fBtime\fR(1)