diff --git a/tests/Makefile b/tests/Makefile
index 426cd69611..af2b0d850c 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -16,6 +16,8 @@ SERVER_REFFILE=$(SRC_DIR)/ffserver.regression.ref
 
 LIBAV_REFFILE=$(SRC_DIR)/libav.regression.ref
 
+SEEK_REFFILE=$(SRC_DIR)/seek.regression.ref
+
 all fulltest test: codectest libavtest
 
 test-server: vsynth1/00.pgm asynth1.sw
@@ -50,6 +52,9 @@ swscale_error:
 	@exit 1
 endif
 
+seektest: seek_test$(EXESUF)
+	@$(SRC_DIR)/seek_test.sh $(SEEK_REFFILE)
+
 # video generation
 
 vsynth1/00.pgm: videogen$(EXESUF)
@@ -77,6 +82,10 @@ audiogen$(EXESUF): audiogen.c
 tiny_psnr$(EXESUF): tiny_psnr.c
 	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
 
+#FIXME cleanup shit below
+seek_test$(EXESUF): seek_test.c
+	$(CC) $(LDFLAGS) $(CFLAGS) -DHAVE_AV_CONFIG_H -I.. -I$(SRC_PATH)/libavformat/ -I$(SRC_PATH)/libavcodec/ -I$(SRC_PATH)/libavutil/ -o $@ $< $(SRC_PATH)/libavformat/libavformat.a $(SRC_PATH)/libavcodec/libavcodec.a $(SRC_PATH)/libavutil/libavutil.a $(EXTRALIBS)
+
 DSPDEPS = $(SRC_PATH)/libavcodec/i386/dsputil_mmx.c \
  $(SRC_PATH)/libavcodec/i386/dsputil_mmx_avg.h \
  $(SRC_PATH)/libavcodec/i386/dsputil_mmx_rnd.h \
diff --git a/tests/seek_test.c b/tests/seek_test.c
new file mode 100644
index 0000000000..cab1b0a607
--- /dev/null
+++ b/tests/seek_test.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright (c) 2003 Fabrice Bellard
+ * Copyright (c) 2007 Michael Niedermayer
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "avformat.h"
+
+int main(int argc, char **argv)
+{
+    const char *filename;
+    AVFormatContext *ic;
+    int i, ret, stream_id;
+    int64_t timestamp;
+
+    /* initialize libavcodec, and register all codecs and formats */
+    av_register_all();
+
+    if (argc != 2) {
+        printf("usage: %s input_file\n"
+               "\n", argv[0]);
+        exit(1);
+    }
+
+    filename = argv[1];
+
+    /* allocate the media context */
+    ic = av_alloc_format_context();
+    if (!ic) {
+        fprintf(stderr, "Memory error\n");
+        exit(1);
+    }
+
+    ret = av_open_input_file(&ic, filename, NULL, 0, NULL);
+    if (ret < 0) {
+        fprintf(stderr, "cant open %s\n", filename);
+        exit(1);
+    }
+
+    ret = av_find_stream_info(ic);
+    if (ret < 0) {
+        fprintf(stderr, "%s: could not find codec parameters\n", filename);
+        exit(1);
+    }
+
+    for(i=0; ; i++){
+        AVPacket pkt;
+        AVStream *st;
+        ret= av_read_frame(ic, &pkt);
+        printf("ret:%2d", ret);
+        if(ret>=0){
+            st= ic->streams[pkt.stream_index];
+            printf(" st:%2d dts:%f pts:%f pos:%Ld size:%d flags:%d", pkt.stream_index, pkt.dts*av_q2d(st->time_base), pkt.pts*av_q2d(st->time_base), pkt.pos, pkt.size, pkt.flags);
+        }
+        printf("\n");
+
+        if(i>25) break;
+
+        stream_id= (i>>1)%(ic->nb_streams+1) - 1;
+        timestamp= (i*19362894167LL) % (4*AV_TIME_BASE) - AV_TIME_BASE;
+        if(stream_id>=0){
+            st= ic->streams[stream_id];
+            timestamp= av_rescale_q(timestamp, AV_TIME_BASE_Q, st->time_base);
+        }
+        ret = av_seek_frame(ic, stream_id, timestamp, (i&1)*AVSEEK_FLAG_BACKWARD);
+        printf("ret:%2d st:%2d ts:%f flags:%d\n", ret, stream_id, timestamp*(stream_id<0 ? 1.0/AV_TIME_BASE : av_q2d(st->time_base)), i&1);
+    }
+
+    return 0;
+}
diff --git a/tests/seek_test.sh b/tests/seek_test.sh
new file mode 100755
index 0000000000..eeac747b1c
--- /dev/null
+++ b/tests/seek_test.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+#feel free to clean this up ive made no attempt to write this overly portable ...
+
+datadir="./data"
+
+logfile="$datadir/seek.regression"
+reffile="$1"
+
+list=`ls data/a-* data/b-* | sort`
+rm $logfile
+for i in $list ; do
+    echo ---------------- >>$logfile
+    echo $i >>$logfile
+    ./seek_test $i >> $logfile
+done
+
+if diff -u "$logfile" "$reffile" ; then
+    echo
+    echo Regression test succeeded.
+    exit 0
+else
+    echo
+    echo Regression test: Error.
+    exit 1
+fi