diff --git a/.gitattributes b/.gitattributes
index 9d577140585fbbbf15d9bb3e1a288fe3dfae0774..5f55dccf6fee54ec1f78d33b311f71530eef1bab 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -31,7 +31,6 @@ testfont binary
 /bin/test_pike.pike foreign_ident
 /lib/master.pike.in foreign_ident
 /lib/modules/ADT.pmod/Table.pmod foreign_ident
-/lib/modules/ADT.pmod/queue.pike foreign_ident
 /lib/modules/Crypto/des3.pike foreign_ident
 /lib/modules/Crypto/des3_cbc.pike foreign_ident
 /lib/modules/Crypto/des_cbc.pike foreign_ident
diff --git a/lib/modules/ADT.pmod/queue.pike b/lib/modules/ADT.pmod/queue.pike
index 6b76a835848bf9ad5e6ff754ac8fba629c7bdf99..8a9bd08b040cd5cf087696393cdce65e10b40289 100644
--- a/lib/modules/ADT.pmod/queue.pike
+++ b/lib/modules/ADT.pmod/queue.pike
@@ -1,56 +1,2 @@
-/* $Id: queue.pike,v 1.5 1997/05/31 22:03:44 grubba Exp $
- *
- * A simple FIFO queue. 
- */
-
-#define QUEUE_SIZE 100
-
-array l;
-int head;
-int tail;
-
-void create(mixed ...args)
-{
-  l = args + allocate(QUEUE_SIZE);
-  head = sizeof(args);
-  tail = 0;
-}
-
-void put(mixed item)
-{
-  if (head == sizeof(l))
-  {
-    l = l[tail ..];
-    head -= tail;
-    tail = 0;
-    l += allocate(sizeof(l) + QUEUE_SIZE);
-  }
-  l[head++] = item;
-//  werror(sprintf("Queue->put: %O\n", l[tail..head-1]));
-}
-
-mixed get()
-{
-//  werror(sprintf("Queue->get: %O\n", l[tail..head-1]));
-  mixed res;
-  if (tail == head)
-    return 0;
-  res = l[tail];
-  l[tail++] = 0;
-  return res;
-}
-
-mixed peek()
-{
-  return (tail < head) && l[tail];
-}
-
-int is_empty()
-{
-  return (tail == head);
-}
-
-void flush()
-{
-  create();
-}
+/* Compatibility name */
+inherit .Queue;