diff --git a/src/Makefile.am b/src/Makefile.am
index 3b0c88e..d105999 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
 enable_pcsc_lite = @enable_pcsc_lite@
 
-bin_PROGRAMS = nfc-anticol nfc-list nfc-mftool nfc-relay nfc-emulate
+bin_PROGRAMS = nfc-anticol nfc-list nfc-mftool nfc-mfultool nfc-relay nfc-emulate
 
 # set the include path found by configure
 INCLUDES= $(all_includes)
 
-nfcinclude_HEADERS = libnfc.h bitutils.h defines.h types.h mifaretag.h devices.h rs232.h dev_arygon.h dev_pn531.h dev_pn533.h
+nfcinclude_HEADERS = libnfc.h bitutils.h defines.h types.h mifaretag.h mifareultag.h devices.h rs232.h dev_arygon.h dev_pn531.h dev_pn533.h
 nfcincludedir = $(includedir)/libnfc
 
 lib_LTLIBRARIES = libnfc.la
@@ -26,6 +26,9 @@ nfc_anticol_LDADD = libnfc.la
 nfc_list_SOURCES = list.c
 nfc_list_LDADD = libnfc.la
 
+nfc_mfultool_SOURCES = mfultool.c
+nfc_mfultool_LDADD = libnfc.la
+
 nfc_mftool_SOURCES = mftool.c
 nfc_mftool_LDADD = libnfc.la
 
diff --git a/src/mfultool.c b/src/mfultool.c
new file mode 100644
index 0000000..93adcab
--- /dev/null
+++ b/src/mfultool.c
@@ -0,0 +1,220 @@
+/*
+ 
+Public platform independent Near Field Communication (NFC) library
+Copyright (C) 2009, Roel Verdult
+ 
+This program 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 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 Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <stddef.h>
+#include <stdbool.h>
+
+#include <string.h>
+#include <ctype.h>
+
+#include "libnfc.h"
+#include "mifareultag.h"
+
+static dev_info* pdi;
+static tag_info ti;
+static mifare_param mp;
+static mifareul_tag mtDump;
+
+bool read_card()
+{
+  int page;
+  bool bSuccess = true;
+
+  // these are pages of 4 bytes each; we can read 4 pages at once.
+  for (page = 0; page <= 0xF;  page += 4){
+      // Try to read out the data block
+        if (nfc_initiator_mifare_cmd(pdi,MC_READ,page,&mp))
+        {
+          memcpy(mtDump.amb[page / 4].mbd.abtData, mp.mpd.abtData, 16);
+        } else {
+          bSuccess = false;
+          break;
+        }
+  }
+  return bSuccess;
+}
+
+bool write_card()
+{
+  uint32_t uiBlock = 0;
+  int page;
+  bool bFailure = false;
+
+  for (page = 0x4; page <= 0xF; page++) {
+    
+      // Show if the readout went well
+      if (bFailure)
+      {
+        printf("x");
+        // When a failure occured we need to redo the anti-collision
+        if (!nfc_initiator_select_tag(pdi,IM_ISO14443A_106,NULL,0,&ti))
+        {
+          printf("!\nError: tag was removed\n");
+          return false;
+        }
+        bFailure = false;
+      } else {
+        // Skip this the first time, bFailure it means nothing (yet)
+        if (uiBlock != 0)
+        {
+          printf(".");
+        }
+      }
+      fflush(stdout);
+    
+      // Make sure a earlier write did not fail
+      if (!bFailure)
+      {
+        // For the Mifare Ultralight, this write command can be used
+        // in compatibility mode, which only actually writes the first 
+        // page (4 bytes). The Ultralight-specific Write command only
+        // writes one page at a time.
+        uiBlock = page / 4;
+        memcpy(mp.mpd.abtData, mtDump.amb[uiBlock].mbd.abtData + ((page % 4) * 4), 16);
+        if (!nfc_initiator_mifare_cmd(pdi, MC_WRITE, page, &mp)) bFailure = true;
+      }
+  }
+  printf("%c|\n",(bFailure)?'x':'.');
+  fflush(stdout);
+  
+  return true;
+}
+
+int main(int argc, const char* argv[])
+{			
+  bool bReadAction;
+  byte_t* pbtUID;
+  FILE* pfDump;
+
+  if (argc < 3)
+  {
+    printf("\n");
+    printf("mfultool <r|w> <dump.mfd>\n");
+    printf("\n");
+    printf("<r|w>       - Perform (read from) or (write to) card\n");
+    printf("<dump.mfd>  - Used to write (card to file) or (file to card)\n");
+    printf("\n");
+    return 1;
+  }
+
+  printf("\nChecking arguments and settings\n");
+
+  bReadAction = (tolower(*(argv[1])) == 'r');
+
+  if (bReadAction)
+  {
+    memset(&mtDump,0x00,sizeof(mtDump));
+  } else {
+    pfDump = fopen(argv[2],"rb");
+
+    if (pfDump == NULL)
+    {
+      printf("Could not open dump file: %s\n",argv[2]);
+      return 1;
+    }
+
+    if (fread(&mtDump,1,sizeof(mtDump),pfDump) != sizeof(mtDump))
+    {
+      printf("Could not read from dump file: %s\n",argv[2]);
+      fclose(pfDump);
+      return 1;
+    }
+    fclose(pfDump);
+  }
+  printf("Succesful opened the dump file\n");
+
+  // Try to open the NFC reader
+  pdi = nfc_connect();
+  if (pdi == INVALID_DEVICE_INFO)
+  {
+    printf("Error connecting NFC reader\n");
+    return 1;
+  }
+
+  nfc_initiator_init(pdi);
+
+  // Drop the field for a while
+  nfc_configure(pdi,DCO_ACTIVATE_FIELD,false);
+  
+  // Let the reader only try once to find a tag
+  nfc_configure(pdi,DCO_INFINITE_SELECT,false);
+  nfc_configure(pdi,DCO_HANDLE_CRC,true);
+  nfc_configure(pdi,DCO_HANDLE_PARITY,true);
+
+  // Enable field so more power consuming cards can power themselves up
+  nfc_configure(pdi,DCO_ACTIVATE_FIELD,true);
+
+  printf("Connected to NFC reader: %s\n",pdi->acName);
+
+  // Try to find a MIFARE Ultralight tag
+  if (!nfc_initiator_select_tag(pdi,IM_ISO14443A_106,NULL,0,&ti))
+  {
+    printf("Error: no tag was found\n");
+    nfc_disconnect(pdi);
+    return 1;
+  }
+
+  // Test if we are dealing with a MIFARE compatible tag
+
+  if (ti.tia.abtAtqa[1] != 0x44){
+      printf("Error: tag is not a MIFARE Ultralight card\n");
+    nfc_disconnect(pdi);
+      return 1;
+  }
+
+
+  // Get the info from the current tag
+  pbtUID = ti.tia.abtUid;
+  printf("Found MIFARE Ultralight card with uid: %08x\n", swap_endian32(pbtUID));
+
+  if (bReadAction)
+  {
+    if (read_card())
+    {
+      printf("Writing data to file: %s\n",argv[2]);
+      fflush(stdout);
+      pfDump = fopen(argv[2],"wb");
+      if (pfDump == NULL)
+      {
+        printf("Could not open file: %s\n",argv[2]);
+        return 1;
+      }
+      if (fwrite(&mtDump,1,sizeof(mtDump),pfDump) != sizeof(mtDump))
+      {
+        printf("Could not write to file: %s\n",argv[2]);
+        return 1;
+      }
+      fclose(pfDump);
+      printf("Done, all bytes dumped to file!\n");
+    }
+  } else {
+    if (write_card())
+    {
+      printf("Done, all data is written to the card!\n");
+    }
+  }
+
+  nfc_disconnect(pdi);
+
+  return 0;
+}
diff --git a/src/mifareultag.h b/src/mifareultag.h
new file mode 100644
index 0000000..520a581
--- /dev/null
+++ b/src/mifareultag.h
@@ -0,0 +1,49 @@
+/*
+ 
+Public platform independent Near Field Communication (NFC) library
+Copyright (C) 2009, Roel Verdult
+ 
+This program 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 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 Lesser General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+*/
+
+#ifndef _LIBNFC_MIFARE_UL_TAG_H_
+#define _LIBNFC_MIFARE_UL_TAG_H_
+
+#include "defines.h"
+
+typedef struct {
+  byte_t sn0[3];
+  byte_t btBCC0;
+  byte_t sn1[4];
+  byte_t btBCC1;
+  byte_t internal;
+  byte_t lock[2];
+  byte_t otp[4];
+} mifareul_block_manufacturer;
+
+typedef struct {
+  byte_t abtData[16];
+} mifareul_block_data;
+
+typedef union {
+  mifareul_block_manufacturer mbm;
+  mifareul_block_data mbd;
+} mifareul_block;
+
+typedef struct {
+  mifareul_block amb[4];
+} mifareul_tag;
+
+#endif // _LIBNFC_MIFARE_UL_TAG_H_