diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..82961ca
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Copyright (C) 2007-2009 LuaDist.
+# Created by Peter Drahoš
+# Redistribution and use of this file is allowed according to the terms of the MIT license.
+# For details see the COPYRIGHT file distributed with LuaDist.
+# Please note that the package source code is licensed under its own license.
+
+PROJECT(lrandom C)
+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
+INCLUDE(dist.cmake)
+
+ADD_LUA_MODULE(random lrandom.c random.def)
+ADD_LUA_TEST(test.lua)
+
+INSTALL(TARGETS random DESTINATION ${INSTALL_CMOD})
+INSTALL(FILES README DESTINATION ${INSTALL_DATA})
+INSTALL(FILES test.lua DESTINATION ${INSTALL_TEST})
diff --git a/dist.cmake b/dist.cmake
new file mode 100644
index 0000000..95928b2
--- /dev/null
+++ b/dist.cmake
@@ -0,0 +1,130 @@
+# LuaDist CMake utility library.
+# Provides variables and utility functions common to LuaDist CMake builds.
+# 
+# Copyright (C) 2007-2010 LuaDist.
+# by David Manura, Peter Drahos
+# Redistribution and use of this file is allowed according to the terms of the MIT license.
+# For details see the COPYRIGHT file distributed with LuaDist.
+# Please note that the package source code is licensed under its own license.
+
+# Few convinence settings
+SET (CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+SET (CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH})
+
+# Where to install module parts:
+set(INSTALL_BIN bin CACHE PATH "Where to install binaries to.")
+set(INSTALL_LIB lib CACHE PATH "Where to install libraries to.")
+set(INSTALL_INC include CACHE PATH "Where to install headers to.")
+set(INSTALL_ETC etc CACHE PATH "Where to store configuration files")
+set(INSTALL_LMOD share/lua/lmod CACHE PATH "Directory to install Lua modules.")
+set(INSTALL_CMOD share/lua/cmod CACHE PATH "Directory to install Lua binary modules.")
+set(INSTALL_DATA share/${PROJECT_NAME} CACHE PATH "Directory the package can store documentation, tests or other data in.")
+set(INSTALL_DOC ${INSTALL_DATA}/doc CACHE PATH "Recommended directory to install documentation into.")
+set(INSTALL_EXAMPLE ${INSTALL_DATA}/example CACHE PATH "Recommended directory to install examples into.")
+set(INSTALL_TEST ${INSTALL_DATA}/test CACHE PATH "Recommended directory to install tests into.")
+set(INSTALL_FOO ${INSTALL_DATA}/etc CACHE PATH "Where to install additional files")
+
+
+# In MSVC, prevent warnings that can occur when using standard libraries.
+if(MSVC)
+	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+endif(MSVC)
+
+# Adds Lua shared library module target `_target`.
+# Additional sources to build the module are listed after `_target`.
+macro(add_lua_module _target)
+	find_package(Lua51 REQUIRED)
+	include_directories(${LUA_INCLUDE_DIR})  #2DO: somehow apply only to _target?
+
+	add_library(${_target} MODULE ${ARGN})
+	set_target_properties(${_target} PROPERTIES PREFIX "")
+	target_link_libraries(${_target} ${LUA_LIBRARY})
+	
+	IF(WIN32)
+		set_target_properties(${_target} PROPERTIES LINK_FLAGS "-Wl,--enable-auto-import")
+	ENDIF()
+
+endmacro(add_lua_module)
+
+# Runs Lua script `_testfile` under CTest tester.
+# Optional argument `_testcurrentdir` is current working directory to run test under
+# (defaults to ${CMAKE_CURRENT_BINARY_DIR}).
+# Both paths, if relative, are relative to ${CMAKE_CURRENT_SOURCE_DIR}.
+# Under LuaDist, set test=true in config.lua to enable testing.
+macro(add_lua_test _testfile)
+	include(CTest)
+	if(BUILD_TESTING)
+		find_program(LUA NAMES lua lua.bat)
+		get_filename_component(TESTFILEABS ${_testfile} ABSOLUTE)
+		get_filename_component(TESTFILENAME ${_testfile} NAME)
+		get_filename_component(TESTFILEBASE ${_testfile} NAME_WE)
+
+		# Write wrapper script.
+		set(TESTWRAPPER ${CMAKE_CURRENT_BINARY_DIR}/${TESTFILENAME})
+		set(TESTWRAPPERSOURCE
+"package.path = '${CMAKE_CURRENT_BINARY_DIR}/?.lua\;${CMAKE_CURRENT_SOURCE_DIR}/?.lua\;' .. package.path
+package.cpath = '${CMAKE_CURRENT_BINARY_DIR}/?.so\;${CMAKE_CURRENT_BINARY_DIR}/?.dll\;' .. package.cpath
+return dofile '${TESTFILEABS}'
+"		)
+		if(${ARGC} GREATER 1)
+			set(_testcurrentdir ${ARGV1})
+			get_filename_component(TESTCURRENTDIRABS ${_testcurrentdir} ABSOLUTE)
+			set(TESTWRAPPERSOURCE
+"require 'lfs'
+lfs.chdir('${TESTCURRENTDIRABS}')
+${TESTWRAPPERSOURCE}")
+		endif()
+		FILE(WRITE ${TESTWRAPPER} ${TESTWRAPPERSOURCE})
+
+		add_test(${TESTFILEBASE} ${LUA} ${TESTWRAPPER})
+	endif(BUILD_TESTING)
+
+	# see also http://gdcm.svn.sourceforge.net/viewvc/gdcm/Sandbox/CMakeModules/UsePythonTest.cmake
+endmacro(add_lua_test)
+
+# Converts Lua source file `_source` to binary string embedded in C source
+# file `_target`.  Optionally compiles Lua source to byte code (not available
+# under LuaJIT2, which doesn't have a bytecode loader).  Additionally, Lua
+# versions of bin2c [1] and luac [2] may be passed respectively as additional
+# arguments.
+#
+# [1] http://lua-users.org/wiki/BinToCee
+# [2] http://lua-users.org/wiki/LuaCompilerInLua
+function(add_lua_bin2c _target _source)
+	find_program(LUA NAMES lua lua.bat)
+	execute_process(COMMAND ${LUA} -e "string.dump(function()end)" RESULT_VARIABLE _LUA_DUMP_RESULT ERROR_QUIET)
+	if (NOT ${_LUA_DUMP_RESULT})
+		SET(HAVE_LUA_DUMP true)
+	endif()
+	message("-- string.dump=${HAVE_LUA_DUMP}")
+
+	if (ARGV2)
+		get_filename_component(BIN2C ${ARGV2} ABSOLUTE)
+		set(BIN2C ${LUA} ${BIN2C})
+	else()
+		find_program(BIN2C NAMES bin2c bin2c.bat)
+	endif()
+	if (HAVE_LUA_DUMP)
+		if (ARGV3)
+			get_filename_component(LUAC ${ARGV3} ABSOLUTE)
+			set(LUAC ${LUA} ${LUAC})
+		else()
+			find_program(LUAC NAMES luac luac.bat)
+		endif()
+	endif (HAVE_LUA_DUMP)
+	message("-- bin2c=${BIN2C}")
+	message("-- luac=${LUAC}")
+
+	get_filename_component(SOURCEABS ${_source} ABSOLUTE)
+	if (HAVE_LUA_DUMP)
+		get_filename_component(SOURCEBASE ${_source} NAME_WE)
+		add_custom_command(
+			OUTPUT  ${_target} DEPENDS ${_source}
+			COMMAND ${LUAC} -o ${CMAKE_CURRENT_BINARY_DIR}/${SOURCEBASE}.lo ${SOURCEABS}
+			COMMAND ${BIN2C} ${CMAKE_CURRENT_BINARY_DIR}/${SOURCEBASE}.lo ">${_target}" )
+	else()
+		add_custom_command(
+			OUTPUT  ${_target} DEPENDS ${SOURCEABS}
+			COMMAND ${BIN2C} ${_source} ">${_target}" )
+	endif()
+endfunction(add_lua_bin2c)
diff --git a/dist.info b/dist.info
new file mode 100644
index 0000000..422d1fd
--- /dev/null
+++ b/dist.info
@@ -0,0 +1,14 @@
+--- This file is part of LuaDist project
+
+name = "lrandom"
+version = "5.1"
+
+desc = "A library for generating random numbers based on the Mersenne Twister, a pseudorandom number generating algorithm."
+author = "Luiz Henrique de Figueiredo"
+url = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lrandom"
+license = "Public domain"
+maintainer = "Peter Drahoš"
+
+depends = {
+	"lua ~> 5.1"
+}
diff --git a/lrandom.c b/lrandom.c
index db10d9f..b05edab 100644
--- a/lrandom.c
+++ b/lrandom.c
@@ -2,7 +2,7 @@
 * lrandom.c
 * random-number library for Lua 5.1 based on the Mersenne Twister
 * Luiz Henrique de Figueiredo <lhf@tecgraf.puc-rio.br>
-* 18 Nov 2010 19:11:40
+* 17 Mar 2010 12:31:47
 * This code is hereby placed in the public domain.
 */
 
@@ -12,15 +12,13 @@
 #include "lua.h"
 #include "lauxlib.h"
 
-/* #define GENRAND32 if you want a 32-bit generator instead of a 53-bit one */
-#include "random.c"
-
 #define MYNAME		"random"
-#define MYVERSION	MYNAME " library for " LUA_VERSION " / Nov 2010 / "\
-			"using " AUTHOR
+#define MYVERSION	MYNAME " library for " LUA_VERSION " / Mar 2010"
 #define MYTYPE		MYNAME " handle"
 
-#define SEED		2010UL
+#define SEED		2009UL
+
+#include "random.c"
 
 static MT *Pget(lua_State *L, int i)
 {
@@ -62,7 +60,7 @@ static int Lseed(lua_State *L)			/** seed(c,[seed]) */
 static int Lvalue(lua_State *L)			/** value(c,[a,b]) */
 {
  MT *c=Pget(L,1);
- double a,b,r=genrand(c);
+ double a,b,r=genrand_res53(c);
  switch (lua_gettop(L))
  {
   case 1:
@@ -93,7 +91,7 @@ static int Ltostring(lua_State *L)
  return 1;
 }
 
-static const luaL_Reg R[] =
+static const luaL_reg R[] =
 {
 	{ "__tostring",	Ltostring	},	/** __tostring(c) */
 	{ "clone",	Lclone		},
diff --git a/random.c b/random.c
index 16686de..39beedf 100644
--- a/random.c
+++ b/random.c
@@ -2,7 +2,7 @@
 * random.c
 * Mersenne Twister random number generator
 * Luiz Henrique de Figueiredo <lhf@tecgraf.puc-rio.br>
-* 18 Nov 2010 19:10:52
+* 23 Sep 2008 22:57:32
 * slightly modified from mt19937ar.c available at
 * http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/MT2002/emt19937ar.html
 */
@@ -119,24 +119,10 @@ static unsigned long genrand_int32(MT *o)
     return y;
 }
 
-/* These real versions are due to Isaku Wada, 2002/01/09 added */
-
-#ifdef GENRAND32
-/* generates a random number on [0,1)-real-interval */
-static double genrand_real2(MT *o)
-{
-    return genrand_int32(o)*(1.0/4294967296.0); 
-    /* divided by 2^32 */
-}
-#define genrand	genrand_real2
-#else
 /* generates a random number on [0,1) with 53-bit resolution*/
 static double genrand_res53(MT *o) 
 { 
     unsigned long a=genrand_int32(o)>>5, b=genrand_int32(o)>>6; 
     return(a*67108864.0+b)*(1.0/9007199254740992.0); 
 } 
-#define genrand	genrand_res53
-#endif
-
-#define AUTHOR "Mersenne Twister"
+/* These real versions are due to Isaku Wada, 2002/01/09 added */
diff --git a/random.def b/random.def
new file mode 100644
index 0000000..d9c40a8
--- /dev/null
+++ b/random.def
@@ -0,0 +1,2 @@
+EXPORTS
+luaopen_random