diff --git a/modules/nodequeue_block/nodequeue_block.info b/modules/nodequeue_block/nodequeue_block.info
new file mode 100644
index 0000000..47c891c
--- /dev/null
+++ b/modules/nodequeue_block/nodequeue_block.info
@@ -0,0 +1,5 @@
+name = Nodequeue Block
+description = Adds a configuration block for each nodequeue.
+package = Nodequeue
+core = 6.x
+dependencies[] = nodequeue
diff --git a/modules/nodequeue_block/nodequeue_block.module b/modules/nodequeue_block/nodequeue_block.module
new file mode 100644
index 0000000..c1f5bae
--- /dev/null
+++ b/modules/nodequeue_block/nodequeue_block.module
@@ -0,0 +1,56 @@
+<?php
+
+/**
+ * @file
+ * Makes individual nodequeue administration available as blocks.
+ */
+
+/**
+ * Implementation of hook_block().
+ */
+function nodequeue_block_block($op = 'list', $delta = 0, $edit = array()) {
+  $nodequeue_array = nodequeue_block_get_nodequeues();
+
+  if ($op == 'list') {
+    $blocks = array();
+    foreach ($nodequeue_array as $key => $queue_item) {
+      $blocks[$key]['info'] = t('Nodequeue Block: ') . $queue_item['name'];
+      $blocks[$key]['cache'] = BLOCK_CACHE_GLOBAL;
+    }
+
+    return $blocks;
+  }
+  elseif ($op == 'view') {
+    module_load_include('inc', 'nodequeue', 'includes/nodequeue.admin');
+
+    while ($delta >= 0) {
+      $qid = $nodequeue_array[$delta]['qid'];
+      $queue = nodequeue_load($qid);
+      $subqueues = nodequeue_load_subqueues_by_queue($qid);
+      $subqueue = array_shift($subqueues);
+      $nodes = _nodequeue_dragdrop_get_nodes($queue, $subqueue);
+
+      $block['title'] = 'Nodequeue: ' . $nodequeue_array[$delta]['name'];
+      $block['content'] = drupal_get_form('nodequeue_arrange_subqueue_form_' . $qid, $queue, $nodes, $subqueue);
+
+      return $block;
+    }
+  }
+}
+
+/**
+ * Creates array of existing nodequeue names and qids
+ */
+function nodequeue_block_get_nodequeues() {
+  $nodequeue_block_queues = array();
+
+  $result = db_query('SELECT qid, title FROM {nodequeue_queue} WHERE show_in_ui = 1');
+  $key = 0;
+  while ($queue = db_fetch_object($result)) {
+    $nodequeue_block_queues[$key]['qid'] = $queue->qid;
+    $nodequeue_block_queues[$key]['name'] = $queue->title;
+    $key++;
+  }
+
+  return $nodequeue_block_queues;
+}